Update for 2018.05.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
linux-headers: bump 4.{4, 17}.x series
2026-01-09 06:10:17 +03:00 · 2018-07-20 00:39:18 +02:00 · 2018-07-20 00:11:16 +02:00 · 2018-07-19 23:51:11 +02:00 · 2018-07-19 23:50:38 +02:00 · 2018-07-19 23:50:02 +02:00
1893 changed files with 13438 additions and 20896 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,11 +63,6 @@ check-package:
            - output/build/packages-file-list.txt

 .runtime_test: &runtime_test
-    # Running the runtime tests for every push is too much, so limit to
-    # explicit triggers through the API.
-    only:
-        - triggers
-        - tags
    # Keep build directories so the rootfs can be an artifact of the job. The
    # runner will clean up those files for us.
    # Multiply every emulator timeout by 10 to avoid sporadic failures in
@@ -152,7 +147,6 @@ imx6slevk_defconfig: *defconfig
 imx6sx-sdb_defconfig: *defconfig
 imx6ulevk_defconfig: *defconfig
 imx6ulpico_defconfig: *defconfig
-imx7d-sdb_defconfig: *defconfig
 imx7dpico_defconfig: *defconfig
 lego_ev3_defconfig: *defconfig
 linksprite_pcduino_defconfig: *defconfig
@@ -171,9 +165,7 @@ nexbox_a95x_defconfig: *defconfig
 nitrogen6sx_defconfig: *defconfig
 nitrogen6x_defconfig: *defconfig
 nitrogen7_defconfig: *defconfig
-nitrogen8m_defconfig: *defconfig
 odroidc2_defconfig: *defconfig
-olimex_a10_olinuxino_lime_defconfig: *defconfig
 olimex_a13_olinuxino_defconfig: *defconfig
 olimex_a20_olinuxino_lime2_defconfig: *defconfig
 olimex_a20_olinuxino_lime_defconfig: *defconfig
@@ -263,11 +255,9 @@ zynq_microzed_defconfig: *defconfig
 zynq_zc706_defconfig: *defconfig
 zynq_zed_defconfig: *defconfig
 zynq_zybo_defconfig: *defconfig
-zynqmp_zcu106_defconfig: *defconfig
 tests.boot.test_atf.TestATFAllwinner: *runtime_test
 tests.boot.test_atf.TestATFMarvell: *runtime_test
 tests.boot.test_atf.TestATFVexpress: *runtime_test
-tests.core.test_file_capabilities.TestFileCapabilities: *runtime_test
 tests.core.test_post_scripts.TestPostScripts: *runtime_test
 tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test
 tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -63,11 +63,6 @@ check-package:
            - output/build/packages-file-list.txt

 .runtime_test: &runtime_test
-    # Running the runtime tests for every push is too much, so limit to
-    # explicit triggers through the API.
-    only:
-        - triggers
-        - tags
    # Keep build directories so the rootfs can be an artifact of the job. The
    # runner will clean up those files for us.
    # Multiply every emulator timeout by 10 to avoid sporadic failures in
--- a/442
+++ b/442
@@ -1,309 +1,3 @@
-2018.08.4, Released December 20th, 2018
-
-	Important / security related fixes.
-
-	Defconfigs: Fixes for ci20, orangepi zero plus 2
-
-	Download wrapper: Fix for urlencode handling
-
-	Updated/fixed packages: c-ares, dante, docker-compose,
-	domoticz, freetype, ghostscript, gnutls, libcurl, libgpgme,
-	libid3tag, libiscsi, libmpd, libopenssl, liboping, libpjsip,
-	linux-firmware, liquid-dsp, luvi, lynx, msgpack, nginx,
-	nodejs, php, popt, pps-tools, prosody, python-numpy,
-	python-requests, samba4, sdl2_net, squashfs, swupdate,
-	systemd, uclibc, vte, webkitgtk, wine, xfsprogs
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11426: pps-tools bash dependency
-
-2018.08.3, Released November 26th, 2018
-
-	Important / security related fixes.
-
-	fs: Drop intermediate tarball from the filesystem handling to
-	fix an issue with xattrs handling related to fakeroot. Ensure
-	tarball target includes xattrs.
-
-	download: Fix confusion in git submodule handling if dl/ is a
-	symlink.
-
-	toolchain: Only allow enabling stack protection on
-	architectures with control flow integrity (CFI) support. Only
-	allow FORTIFY_SOURCE support on gcc >= 6.
-
-	genrandconfig: Fix missing newline in BR2_WGET handling,
-	causing the following line to be ignored. This would affect
-	BR2_ENABLE_DEBUG, BR2_INIT_BUSYBOX, BR2_INIT_SYSTEMD,
-	BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV, BR2_STATIC_LIBS or
-	BR2_PACKAGE_PYTHON_PY_ONLY depending on the randomization.
-
-	show-build-order: Also include the dependencies of
-	rootfs-common.
-
-	Defconfigs: Fixes for Armadeus APF27, imx6sabre, Olimex A20
-	olinuxino lime legacy, Orangepi zero plus 2.
-
-	graph-depends: Fix for package names starting with a non-alpha
-	character.
-
-	Updated/fixed packages: attr, audit, bind, brotli, busybox,
-	dtc, easydbus, elfutils, flare-engine, flatcc, gauche, gcc,
-	giflib, gpsd, lcdproc, libcurl, libiscsi, libkcapi, libnfs,
-	libnspr, libnss, libsemanage, liburiparser, lighttpd,
-	lua-curl, mariadb, mmc, mosquitto, mysql, ncmpc, neardal,
-	netplug, network-manager, nfs-utils, nginx, openocd, openswan,
-	p11-kit, postgresql, prosody, qemu, qt, rpm, ruby, samba4,
-	squid, supertuxkart, systemd, tar, trace-cmd, traceroute,
-	twolame, uclibc, usb_modeswitch, vtun, webkitgtk, weston,
-	xdriver_xf86-video-geode, xlib_libfontenc, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11086: download/git submodule breaks on symlinked dl folder
-	#11481: Docs: Is external.desc required?
-
-2018.08.2, Released October 25th, 2018
-
-	Important / security related fixes.
-
-	Workaround added for incompatibility issues between host-dtc
-	and older U-Boot and Linux kernel versions.
-
-	Detect and reject build paths containing '@', as this confuses
-	a number of packages, including GCC.
-
-	utils/get-developers: Add -e option for use with git
-	send-email.
-
-	utils/diffconfig: Make it work for (non-Buildroot) config
-	files not using the BR2_ prefix.
-
-	u-boot: Fix for environment image handling on big endian
-	systems.
-
-	Updated/fixed packages: binutils, ca-certificates,
-	cups-filters, dtc, erlang, file, freetype, gcc, git, gvfs,
-	jasper, leveldb, libarchive, libssh, live555, ljlinenoise,
-	mariadb, mongoose, netsnmp, nmap, nodejs, ntp, open-plc-utils,
-	poco, psmisc, ptpd2, python-enum34, qemu, qt, qt5base,
-	setools, spice, spice-protocol, tinc, ustr, wireshark,
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11396: uboot environment image checksum invalid if target is big endian
-
-2018.08.1, 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/fixed packages: acpid, android-tools, apache,
-	arp-scan, bandwidthd, bind, brltty, clamav, connman, cppcms,
-	domoticz, dtc, fio, gcc, gdb, ghostscript, gnupg, httpping,
-	igmpproxy, imlib2, ipsec-tools, libesmtp, libnfs, libxslt,
-	links, lua, mosquitto, nilfs-utils, ocrad, parted, php,
-	python-django, screen, shairport-sync, strongswan,
-	vboot-utils, webkitgtk, wireguard, x265 xen, xlib_libXdmcp,
-	xlib_libXfont, xlib_libXft, xlib_libxshmfence,
-	xutil_makedepend, zeromq
-
-2018.08, Released September 6th, 2018
-
-	Minor fixes.
-
-	Known issues:
-
-	- Glibc 2.28 on the build host breaks compilation of a number
-	  of host packages. 2018.08 contains fixes for some of these
-	  packages, but not all. Consider building on hosts (or in
-	  containers) using older Glibc versions.
-
-	- host-dtc 1.4.7 breaks compilation of older U-Boot and Linux
-          kernel configurations using FDT/DTC. Consider updating the
-          Linux kernel to >= 4.17 and U-Boot to >= 2018.07 or
-          backporting commit 9130ba8846 (scripts/dtc: Update to
-          upstream version v1.4.6-9-gaadd0b65c987) for the Linux
-          kernel / commit db405d1980 for U-Boot.
-	  Alternatively revert commit 7b929ddcf0 (dtc: bump version to
-          1.4.7) and ensure your build host does not have the libfdt
-          development headers installed.
-
-	Updated/fixed packages: busybox, chipmunk, cutelyst,
-	domoticz, gcc, imagemagick, lcms2, libcurl, mediastreamer,
-	moarvm, php, qt, qt5virtualkeyboard, qt5webengine, screen,
-	sdl2, squashfs, uboot, xen
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11261: ccache using wrong cached objects
-	#11276: Understanding the patch for kernel-4.9 and other..
-
-2018.08-rc3, Released August 31th, 2018
-
-	Fixes all over the tree.
-
-	linux: additional improvements to the flex / bison dependency
-	handling, use system provided variant if available. Ensure
-	toolchain is available when configuring for 4.18+ support.
-
-	Download: Fix handling of primary sites using file://
-
-	Toolchain: Correct external toolchain musl detection for
-	static toolchains.
-
-	Updated/fixed packages: aircrack-ng, bison, brltty, busybox,
-	cutelyst, dropbear, gr-osmosdr, i2c-tools, json-c, libconfuse,
-	libkcapi, libsoup, libssh, liburiparser, mbedtls, mender,
-	mesa3d, minicom, mjpegtools, mutt, openpowerlink, openssh,
-	oracle-mysql, php, postgresql, pv, qt5base, qt5quickcontrols,
-	rauc, shairport-sync, systemd, xlib_libX11, zeromq,
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11091: BR2_PRIMARY_SITE doesn't work (wget is selected...
-	#11141: WF111 package no longer available
-	#11211: Internal compiler error: Killed (program cc1plus)..
-	#11236: util-linux fails to build on Travis CI when python..
-	#11246: Glibc 2.28 - fails to build host-bison and host-m4
-	#11256: Add python-falcon and python-mimeparse packages
-
-2018.08-rc2, Released August 20th, 2018
-
-	Fixes all over the tree.
-
-	pkg-kconfig: Support dependencies needed to run the
-	configurator, E.G. recent Linux kernel versions needing flex
-	and bison.
-
-	Defconfigs: ARM Juno: Bump ATF to fix a build
-	issue. Raspberrypi2: Bump rootfs size. Snps_archs38_vdk:
-	Correct /etc/inittab. Technologic ts7680: Correct genimage
-	configuration. Orange PI PC / Zero, Sheevaplug: Bump U-boot to
-	2018.07 to fix build issue. Ensure host-openssl is pulled in
-	for kernel builds where needed.
-
-	Updated/fixed packages: aircrack-ng, bind, boost,
-	boot-wrapper-aarch64, bzip2, busybox, chrony, cryptsetup,
-	dahdi-tools, dbus, domoticz, eigen, ipsec-tools, libarchive,
-	libfuse, libgit2, libopenssl, libselinux, lighttpd, lvm2, m4,
-	makedevs, mariadb, mesa3d-headers, mono, ncmpc, ncurses,
-	nodejs, php, python-django, python-pyqt5, qt5base,
-	qt5serialbus, ruby, samba4, uboot-tools, uclibc, vlc,
-	waylandpp, wireless_tools, wireshark, wpa_supplicant, mtd,
-	xdriver_xf86-video-ati, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10781: cryptsetup luksOpen container_file container causes..
-	#10996: bogus musl ARM toolchain
-	#11191: xattr and check-package issue
-
-2018.08-rc1, Released August 5th, 2018
-
-	Toolchain:
-
-	- add support for gcc 8.x, switch to gcc 7.x as the default
-	  version
-	- add support for gdb 8.1, switch to gdb 8.0 as the default
-	  and remove gdb 7.10/7.11
-	- add support for binutils 2.31
-	- NIOSII CodeSourcery toolchain updated
-	- Linaro AArch64 BE toolchain added, and other Linaro
-	  toolchains updated
-	- Synopsys ARC pre-built toolchain updated
-
-	Architecture: add support for ARM Cortex-M7
-
-	Major updates:
-
-	- systemd bumped to 239
-	- Qt5 bumped to 5.11.1
-	- Rust bumped to 1.27
-	- GStreamer stack bumped to 1.14.2
-	- X.org server bumped to 1.20, and all X.org proto packages
-	  replaced by the single xorgproto package
-	- i.MX6 support packages bumped to 6.2.4
-	- i.MX Vivante graphics version bumped to 6.2.4.p1.2,
-	  adding support for Wayland and i.MX8MQ platforms
-
-	Linux: bumped to 4.17 by default.
-
-	Infrastructure: new package infrastructure added for packages
-	using the Meson build system
-
-	New packages: at-spi2-atk, at-spi2-core, capnproto, cmocka,
-	corkscrew, cutelyst, davfs2, flatcc, libidn2, libgit2,
-	libopusenc, mender, nghttp2, perl-convert-asn1, perl-crypt-blowfish,
-	perl-crypt-cbc, perl-digest-md5, perl-mime-base64-urlsafe,
-	perl-mojolicious-plugin-authentication, perl-net-ping,
-	perl-net-snmp, perl-net-ssh2, perl-net-telnet, pigz,
-	python-reentry, python-request-id, python-validators,
-	python-webob, shadowsocks-libev, speexdsp, xorgproto, wampcc
-
-	New defconfigs: NXP i.MX7D SDB, Boundary Devices Nitrogen 8M,
-	Olimex A10 OLinuxino, ZynqMP ZCU106
-
-	Removed packages: all xproto_* have been removed and replaced
-	by xorgproto
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#9411:	MUSL build with RT Error relocating /lib/libgcc_s.so.1:
-		__cpu_indicator_init: symbol not found
-	#9921: lockfile module within python-daemon not	 available
-	#10341: gdb install of py files when using buildroot toolchain
-		includes build path
-	#10661: /etc/init.d/S29netplug starts multiple	instances of netplugd
-	#10751: Missing dependency in pulseaudio package
-	#10811: kodi-17.6-Krypton does not compile for	freescale_* devices
-	#10856: openblas on qemu_x86_64_defconfig fails with
-		"sgemm_kernel.o: No such file or directory"
-	#11056: Compiling a file that uses libdrm headers fails with:
-		fatal error: drm.h: No such file or directory
-	#11061: support/download: git version=master broken
-	#11071: Building postgresql package on Debian 9.4  x64 for armel target fails
-	#11076: Docker containerd installed to incorrect  path
-	#11101: host-patchelf Endian Issue with relative  RPATH
-	#11111: raspberry pi 3 b+: missing BSP for 64-bit  kernel
-	#11121: statfs call corrupts memory struct statfs  too small
-	#11181: Switching toolchain does not work
-
-2018.05.2, Released August 28th, 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, attr, apache, bind,
-	boot-wrapper-aarch64, brltty, bzip2, chrony, crda, cryptsetup,
-	dahdi-tools, dmidecode, dropbear, eigen, ffmpeg, gawk, gcc,
-	ghostscript, gnutls, imx-gpu-viv, ipsec-tools, libarchive,
-	libfuse, libglib2, libopenssl, libselinux, libsoup, lighttpd,
-	linuxptp, lttng-modules, lttng-tools, lua-flu, lvm2, m4,
-	makedevs, mariadb, mbedtls, mesa3d-heders, mtd, ncurses,
-	nodejs, openssh, php, python-django, rauc, ruby, samba4,
-	stress-ng, ti-utils, uboot-tools, uclibc, vim, waylandpp,
-	wireless_tools, wireless-regdb, 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.05.1, Released July 20th, 2018

 	Important / security related fixes.
@@ -532,142 +226,6 @@
 	#10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is
 		enabled

-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.
--- a/Config.in
+++ b/Config.in
@@ -67,9 +67,6 @@ config BR2_HOST_GCC_AT_LEAST_8
 	default y if BR2_HOST_GCC_VERSION = "8"
 	select BR2_HOST_GCC_AT_LEAST_7

-# When adding new entries above, be sure to update
-# the HOSTCC_MAX_VERSION variable in the Makefile.
-
 # Hidden boolean selected by packages in need of Java in order to build
 # (example: kodi)
 config BR2_NEEDS_HOST_JAVA
@@ -812,8 +809,6 @@ config BR2_FORTIFY_SOURCE_NONE

 config BR2_FORTIFY_SOURCE_1
 	bool "Conservative"
-	# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
-	depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	help
 	  This option sets _FORTIFY_SOURCE to 1 and only introduces
 	  checks that shouldn't change the behavior of conforming
@@ -821,8 +816,6 @@ config BR2_FORTIFY_SOURCE_1

 config BR2_FORTIFY_SOURCE_2
 	bool "Aggressive"
-	# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
-	depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	help
 	  This option sets _FORTIFY_SOURCES to 2 and some more
 	  checking is added, but some conforming programs might fail.
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -142,351 +142,6 @@ comment "unpredictable ways.                                 "
 comment "----------------------------------------------------"
 endif

-###############################################################################
-comment "Legacy options removed in 2018.08"
-
-config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
-	bool "Modular X.org server was updated to version 1.20.0"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
-	help
-	  Modular X.org server was updated to version 1.20.0
-
-config BR2_PACKAGE_XPROTO_APPLEWMPROTO
-	bool "xproto-applewmproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-applewmproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_BIGREQSPROTO
-	bool "xproto-bigreqsproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-bigreqsproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_COMPOSITEPROTO
-	bool "xproto-compositeproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-compositeproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DAMAGEPROTO
-	bool "xproto-dameproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dameproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DMXPROTO
-	bool "xproto-dmxproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dmxproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DRI2PROTO
-	bool "xproto-dri2proto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dri2proto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_DRI3PROTO
-	bool "xproto-dri3proto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-dri3proto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_FIXESPROTO
-	bool "xproto-fixesproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-fixesproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_FONTCACHEPROTO
-	bool "xproto-fontcacheproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-fontcacheproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_FONTSPROTO
-	bool "xproto-fontsproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-fontsproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_GLPROTO
-	bool "xproto-glproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-glproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_INPUTPROTO
-	bool "xproto-inputproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-inputproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_KBPROTO
-	bool "xproto-kbproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-kbproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_PRESENTPROTO
-	bool "xproto-presentproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-presentproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RANDRPROTO
-	bool "xproto-randrproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-randrproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RECORDPROTO
-	bool "xproto-recordproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-recordproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RENDERPROTO
-	bool "xproto-renderproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-renderproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_RESOURCEPROTO
-	bool "xproto-resourceproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-resourceproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
-	bool "xproto-scrnsaverprot package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-scrnsaverprot package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_VIDEOPROTO
-	bool "xproto-videoproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-videoproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_WINDOWSWMPROTO
-	bool "xproto-windowswmproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-windowswmproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XCMISCPROTO
-	bool "xproto-xcmiscproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xcmiscproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XEXTPROTO
-	bool "xproto-xextproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xextproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
-	bool "xproto-xf86bigfontproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86bigfontproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86DGAPROTO
-	bool "xproto-xf86dgaproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86dgaproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86DRIPROTO
-	bool "xproto-xf86driproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86driproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
-	bool "xproto-xf86vidmodeproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xf86vidmodeproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XINERAMAPROTO
-	bool "xproto-xineramaproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xineramaproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XPROTO
-	bool "xproto-xproto package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xproto package has been replaced by the
-	  xorgproto package, which combines all xproto_* packages.
-
-config BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
-	bool "xproto-xproxymanagementprotocol package replaced by xorgproto"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XORGPROTO
-	help
-	  The xproto-xproxymanagementprotocol package has been
-	  replaced by the xorgproto package, which combines all
-	  xproto_* packages.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
-	bool "gst1-plugins-bad opengl option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL
-	help
-	  The opengl option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2
-	bool "gst1-plugins-bad gles2 option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLES2
-	help
-	  The gles2 option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX
-	bool "gst1-plugins-bad glx option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX
-	help
-	  The glx option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
-	bool "gst1-plugins-bad egl option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL
-	help
-	  The egl option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11
-	bool "gst1-plugins-bad x11 option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11
-	help
-	  The x11 option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND
-	bool "gst1-plugins-bad wayland option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND
-	help
-	  The wayland option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX
-	bool "gst1-plugins-bad dispmanx option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX
-	help
-	  The dispmanx option has been moved from gst1-plugins-mad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER
-	bool "gst1-plugins-bad audiomixer option moved to gst1-plugins-base"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER
-	help
-	  The audiomixer option has been moved from gst1-plugins-bad to
-	  gst1-plugins-base.
-
-config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
-	bool "gst1-plugins-ugly lame option moved to gst1-plugins-good"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME
-	help
-	  The lame option has been moved from gst1-plugins-ugly to
-	  gst1-plugins-good.
-
-config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123
-	bool "gst1-plugins-ugly mpg123 option moved to gst1-plugins-good"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123
-	help
-	  The mpg123 option has been moved from gst1-plugins-ugly to
-	  gst1-plugins-good.
-
-config BR2_GDB_VERSION_7_11
-	bool "gdb 7.11 has been removed"
-	select BR2_LEGACY
-	help
-	  The 7.11 version of gdb has been removed. Use a newer version
-	  instead.
-
-config BR2_GDB_VERSION_7_10
-	bool "gdb 7.10 has been removed"
-	select BR2_LEGACY
-	help
-	  The 7.10 version of gdb has been removed. Use a newer version
-	  instead.
-
 ###############################################################################
 comment "Legacy options removed in 2018.05"

@@ -514,8 +169,6 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
 	  BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to
 	  BR2_PACKAGE_LIBMEDIAART_BACKEND_QT

-# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM335X
 	bool "ti-sgx-km AM335X option renamed"
 	select BR2_LEGACY
@@ -524,8 +177,6 @@ config BR2_PACKAGE_TI_SGX_AM335X
 	  BR2_PACKAGE_TI_SGX_AM335X has been renamed to
 	  BR2_PACKAGE_TI_SGX_KM_AM335X.

-# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM437X
 	bool "ti-sgx-km AM437X option renamed"
 	select BR2_LEGACY
@@ -534,8 +185,6 @@ config BR2_PACKAGE_TI_SGX_AM437X
 	  BR2_PACKAGE_TI_SGX_AM437X has been renamed to
 	  BR2_PACKAGE_TI_SGX_KM_AM437X.

-# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM4430
 	bool "ti-sgx-km AM4430 option renamed"
 	select BR2_LEGACY
@@ -544,8 +193,6 @@ config BR2_PACKAGE_TI_SGX_AM4430
 	  BR2_PACKAGE_TI_SGX_AM4430 has been renamed to
 	  BR2_PACKAGE_TI_SGX_KM_AM4430.

-# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from
-# package/ti-sgx-km/Config.in
 config BR2_PACKAGE_TI_SGX_AM5430
 	bool "ti-sgx-km AM5430 option renamed"
 	select BR2_LEGACY
--- a/251
+++ b/251
@@ -143,9 +143,7 @@ N:	Andy Kennedy <andy.kennedy@adtran.com>
 F:	package/libunwind/

 N:	Angelo Compagnucci <angelo.compagnucci@gmail.com>
-F:	package/corkscrew/
 F:	package/i2c-tools/
-F:	package/mender/
 F:	package/mono/
 F:	package/mono-gtksharp3/
 F:	package/monolite/
@@ -157,7 +155,9 @@ F:	package/sysdig/

 N:	Anisse Astier <anisse@astier.eu>
 F:	package/go/
-F:	package/nghttp2/
+
+N:	Antony Pavlov <antonynpavlov@gmail.com>
+F:	package/lsscsi/

 N:	Anthony Viallard <viallard@syscom-instruments.com>
 F:	package/gnuplot/
@@ -165,9 +165,6 @@ F:	package/gnuplot/
 N:	Antoine Ténart <antoine.tenart@bootlin.com>
 F:	package/wf111/

-N:	Antony Pavlov <antonynpavlov@gmail.com>
-F:	package/lsscsi/
-
 N:	ARC Maintainers <arc-buildroot@synopsys.com>
 F:	arch/Config.in.arc
 F:	board/synopsys/
@@ -186,7 +183,6 @@ F:	package/espeak/

 N:	Arnout Vandecappelle <arnout@mind.be>
 F:	package/arp-scan/
-F:	package/dehydrated/
 F:	package/freescale-imx/firmware-imx/
 F:	package/freescale-imx/imx-lib/
 F:	package/gstreamer/gst-fsl-plugins/
@@ -197,9 +193,7 @@ F:	package/sqlcipher/
 F:	package/stress/

 N:	Asaf Kahlon <asafka7@gmail.com>
-F:	package/libuv/
 F:	package/python-jsonmodels/
-F:	package/python-reentry/
 F:	package/python-subprocess32/
 F:	package/python-yieldfrom/
 F:	package/zeromq/
@@ -269,9 +263,9 @@ F:	package/dtv-scan-tables/
 F:	package/eudev/
 F:	package/exim/
 F:	package/fetchmail/
-F:	package/ffmpeg/
 F:	package/freeswitch/
 F:	package/freeswitch-mod-bcg729/
+F:	package/ffmpeg/
 F:	package/ghostscript/
 F:	package/giflib/
 F:	package/glmark2/
@@ -374,7 +368,6 @@ F:	package/python-slob/
 F:	package/rtmpdump/
 F:	package/samba4/
 F:	package/softether/
-F:	package/sqlite/
 F:	package/taglib/
 F:	package/tinyxml2/
 F:	package/tor/
@@ -412,20 +405,11 @@ N:	Carlo Caione <carlo.caione@gmail.com>
 F:	package/sunxi-boards/

 N:	Carlos Santos <casantos@datacom.com.br>
-F:	package/busybox/
 F:	package/gtest/
-F:	package/initscripts/
 F:	package/libpam-radius-auth/
 F:	package/libpam-tacplus/
 F:	package/modem-manager/
 F:	package/perl-file-util/
-F:	package/skeleton-custom/
-F:	package/skeleton-init-common/
-F:	package/skeleton-init-none/
-F:	package/skeleton-init-systemd/
-F:	package/skeleton-init-sysv/
-F:	package/skeleton/
-F:	package/sysvinit/
 F:	package/util-linux/
 F:	package/tpm2-abrmd/
 F:	package/tpm2-tools/
@@ -437,9 +421,6 @@ F:	package/libdvbsi/
 F:	package/libsvg/
 F:	package/libsvg-cairo/

-N:	Cédric Chépied <cedric.chepied@gmail.com>
-F:	package/znc/
-
 N:	Chakra Divi <chakra@openedev.com>
 F:	board/friendlyarm/nanopi-m1
 F:	board/friendlyarm/nanopi-m1-plus
@@ -496,6 +477,9 @@ 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/
+
 N:	Cyril Bur <cyrilbur@gmail.com>
 F:	arch/Config.in.powerpc
 F:	package/kvm-unit-tests
@@ -511,9 +495,6 @@ N:	Damien Lanson <damien@kal-host.com>
 F:	package/libvdpau/
 F:	package/log4cpp/

-N:	Daniel Nicoletti <dantti12@gmail.com>
-F:	package/cutelyst/
-
 N:	Daniel Nyström <daniel.nystrom@timeterminal.se>
 F:	package/e2tools/

@@ -599,7 +580,6 @@ F:	package/hicolor-icon-theme/
 F:	package/jemalloc/
 F:	package/meson/
 F:	package/ninja/
-F:	package/pkg-meson.mk
 F:	package/rust-bin/
 F:	package/rust/
 F:	package/s6/
@@ -664,7 +644,6 @@ F:	configs/imx6slevk_defconfig
 F:	configs/imx6sx-sdb_defconfig
 F:	configs/imx6ulevk_defconfig
 F:	configs/imx6ulpico_defconfig
-F:	configs/imx7d-sdb_defconfig
 F:	configs/imx7dpico_defconfig
 F:	configs/mx25pdk_defconfig
 F:	configs/mx51evk_defconfig
@@ -692,8 +671,6 @@ F:	package/alljoyn-base/
 F:	package/alljoyn-tcl/
 F:	package/alljoyn-tcl-base/
 F:	package/boinc/
-F:	package/cairo/
-F:	package/expat/
 F:	package/flatbuffers/
 F:	package/gtksourceview/
 F:	package/gssdp/
@@ -703,7 +680,6 @@ F:	package/gupnp-tools/
 F:	package/hiredis/
 F:	package/i2pd/
 F:	package/igd2-for-linux/
-F:	package/json-c/
 F:	package/lcms2/
 F:	package/lftp/
 F:	package/libcap-ng/
@@ -717,39 +693,23 @@ F:	package/libglib2/
 F:	package/libgtk2/
 F:	package/libgtk3/
 F:	package/libidn/
-F:	package/libidn2/
 F:	package/libjpeg/
 F:	package/liblockfile/
 F:	package/libmatroska/
 F:	package/libmpdclient/
 F:	package/libnetfilter_conntrack/
 F:	package/libnetfilter_queue/
-F:	package/liboping/
-F:	package/libpfm4/
-F:	package/libraw/
-F:	package/libraw1394/
-F:	package/libroxml/
-F:	package/librsvg/
-F:	package/librsync/
-F:	package/libsoup/
-F:	package/libsoxr/
 F:	package/libupnp/
 F:	package/libupnp18/
-F:	package/libv4l/
-F:	package/libxslt/
-F:	package/mbedtls/
 F:	package/minissdpd/
-F:	package/minizip/
 F:	package/motion/
 F:	package/mutt/
 F:	package/ncmpc/
-F:	package/oprofile/
 F:	package/pcmanfm/
 F:	package/rygel/
 F:	package/safeclib/
 F:	package/tinycbor/
 F:	package/tinydtls/
-F:	package/tinymembench/
 F:	package/whois/

 N:	Falco Hyfing <hyfinglists@gmail.com>
@@ -811,7 +771,6 @@ F:	package/zxing-cpp/
 N:	Gaël Portay <gael.portay@savoirfairelinux.com>
 F:	package/qt5/qt5virtualkeyboard/
 F:	package/qt5/qt5webengine/
-F:	package/qt5/qt5webkit/
 F:	package/qt5/qt5webkit-examples/

 N:	Gary Bisson <gary.bisson@boundarydevices.com>
@@ -904,6 +863,8 @@ F:	board/amarula/
 F:	board/asus/
 F:	board/bananapi/
 F:	board/engicam/
+F:	configs/amarula_vyasa_rk3288_defconfig
+F:	configs/asus_tinker_rk3288_defconfig
 F:	board/friendlyarm/nanopi-a64/
 F:	board/friendlyarm/nanopi-neo2/
 F:	board/olimex/a64-olinuxino/
@@ -912,15 +873,8 @@ F:	board/orangepi/orangepi-prime/
 F:	board/orangepi/orangepi-win/
 F:	board/orangepi/orangepi-zero-plus2/
 F:	board/pine64/
-F:	configs/amarula_vyasa_rk3288_defconfig
-F:	configs/asus_tinker_rk3288_defconfig
 F:	configs/bananapi_m1_defconfig
 F:	configs/bananapi_m64_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
 F:	configs/friendlyarm_nanopi_a64_defconfig
 F:	configs/friendlyarm_nanopi_neo2_defconfig
 F:	configs/olimex_a64_olinuxino_defconfig
@@ -930,6 +884,11 @@ 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/
@@ -945,14 +904,14 @@ 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 Kundrát <jan.kundrat@cesnet.cz>
 F:	configs/solidrun_clearfog_defconfig
 F:	board/solidrun/clearfog/

+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/

@@ -976,30 +935,20 @@ F:	package/batctl/
 N:	Jeremy Rosen <jeremy.rosen@openwide.fr>
 F:	package/fxload/

-N:	Jérôme Oufella <jerome.oufella@savoirfairelinux.com>
-F:	package/libdri2/
-F:	package/qt-webkit-kiosk/
-
-N:	Jérôme Pouiller <jezz@sysmic.org>
-F:	package/apitrace/
-F:	package/freescale-imx/gpu-amd-bin-mx51/
-F:	package/freescale-imx/libz160/
-F:	package/lxc/
-F:	package/strongswan/
-F:	package/wmctrl/
-F:	package/x11r7/xdriver_xf86-video-imx/
-F:	package/x11r7/xdriver_xf86-video-imx-viv/
-
-N:	Joel Carlson <JoelsonCarl@gmail.com>
-F:	package/capnproto/
-F:	package/cmocka/
-F:	package/flatcc/
-
 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/libnss/
+F:	package/python-cython/
+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/

@@ -1038,22 +987,6 @@ N:	Jonathan Liu <net147@gmail.com>
 F:	package/python-meld3/
 F:	package/supervisor/

-N:	Jörg Krause <joerg.krause@embedded.rocks>
-F:	board/lemaker/bananapro/
-F:	configs/bananapro_defconfig
-F:	package/augeas/
-F:	package/bluez-alsa/
-F:	package/freescale-imx/imx-alsa-plugins/
-F:	package/libopusenc/
-F:	package/libupnpp/
-F:	package/luv/
-F:	package/luvi/
-F:	package/mpd/
-F:	package/shairport-sync/
-F:	package/swupdate/
-F:	package/upmpdcli/
-F:	package/wavemon/
-
 N:	Joris Lijssens <joris.lijssens@gmail.com>
 F:	package/emlog/
 F:	package/libcoap/
@@ -1062,19 +995,6 @@ F:	package/libuio/
 F:	package/netsniff-ng/
 F:	package/rabbitmq-c/

-N:	Joseph Kogut <joseph.kogut@gmail.com>
-F:	package/at-spi2-atk/
-F:	package/at-spi2-core/
-F:	package/clang/
-F:	package/gconf/
-F:	package/libnss/
-F:	package/llvm/
-F:	package/python-cython/
-F:	package/python-raven/
-F:	package/python-schedule/
-F:	package/python-websockets/
-F:	package/python-xlib/
-
 N:	Joshua Henderson <joshua.henderson@microchip.com>
 F:	package/qt5/qt5wayland/

@@ -1091,7 +1011,6 @@ F:	package/tegrarcm/
 N:	Julien Boibessot <julien.boibessot@armadeus.com>
 F:	board/armadeus/
 F:	configs/armadeus*
-F:	package/abootimg/
 F:	package/gpm/
 F:	package/lbreakout2/
 F:	package/libcddb/
@@ -1106,6 +1025,9 @@ 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/
@@ -1113,6 +1035,37 @@ F:	package/easy-rsa/
 N:	Justin Maggard <jmaggard@netgear.com>
 F:	package/dtach/

+N:	Jérôme Oufella <jerome.oufella@savoirfairelinux.com>
+F:	package/libdri2/
+F:	package/qt-webkit-kiosk/
+
+N:	Jérôme Pouiller <jezz@sysmic.org>
+F:	package/apitrace/
+F:	package/freescale-imx/gpu-amd-bin-mx51/
+F:	package/freescale-imx/libz160/
+F:	package/lxc/
+F:	package/strongswan/
+F:	package/wmctrl/
+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/freescale-imx/imx-alsa-plugins/
+F:	package/libshout/
+F:	package/libupnpp/
+F:	package/luv/
+F:	package/luvi/
+F:	package/mp4v2/
+F:	package/mpd/
+F:	package/shairport-sync/
+F:	package/swupdate/
+F:	package/upmpdcli/
+F:	package/wavemon/
+
 N:	Karoly Kasza <kaszak@gmail.com>
 F:	package/irqbalance/
 F:	package/openvmtools/
@@ -1126,7 +1079,6 @@ N:	Kevin Joly <kevin.joly@sensefly.com>
 F:	package/libgphoto2/

 N:	Koen Martens <gmc@sonologic.nl>
-F:	package/capnproto/
 F:	package/linuxconsoletools/

 N:	Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
@@ -1137,16 +1089,9 @@ F:	package/nilfs-utils/
 N:	Laurent Cans <laurent.cans@gmail.com>
 F:	package/aircrack-ng/

-N:	Laurent Charpentier <laurent_pubs@yahoo.com>
-F:	package/open-lldp/
-
 N:	Lee Jones <lee.jones@linaro.org>
 F:	boot/afboot-stm32/

-N:	Leon Anavi <leon.anavi@konsulko.com>
-F:	board/olimex/a10_olinuxino
-F:	configs/olimex_a10_olinuxino_lime_defconfig
-
 N:	Lionel Flandrin <lionel@svkt.org>
 F:	package/python-babel/
 F:	package/python-daemonize/
@@ -1165,10 +1110,8 @@ F:	package/ti-sgx-um/
 N:	Luca Ceresoli <luca@lucaceresoli.net>
 F:	board/olimex/a20_olinuxino/
 F:	board/zynq/
-F:	board/zynqmp/
 F:	configs/olimex_a20_olinuxino_*
 F:	configs/zynq_zed_defconfig
-F:	configs/zynqmp_zcu106_defconfig
 F:	package/agentpp/
 F:	package/exim/
 F:	package/libpjsip/
@@ -1430,19 +1373,9 @@ N:	Michał Łyszczek <michal.lyszczek@bofc.pl>
 F:	board/altera/socrates_cyclone5/
 F:	configs/socrates_cyclone5_defconfig

-N:	Mike Harmony <mike.harmony@snapav.com>
-F:	board/sinovoip/m2-plus/
-F:	configs/bananapi_m2_plus_defconfig
-
 N:	Mikhail Boiko <mikhailboiko85@gmail.com>
 F:	package/libfribidi/

-N:	Min Xu <xuminready@gmail.com>
-F:	package/shadowsocks-libev/
-
-N:	Mirza Krak <mirza.krak@northern.tech>
-F:	package/mender/
-
 N:	Morgan Delestre <m.delestre@sinters.fr>
 F:	package/monkey/

@@ -1450,6 +1383,10 @@ 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/

@@ -1464,9 +1401,6 @@ N:	Naumann Andreas <ANaumann@ultratronik.de>
 F:	package/evemu/
 F:	package/libevdev/

-N:	Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
-F:	package/libgit2/
-
 N:	Nicolas Serafini <nicolas.serafini@sensefly.com>
 F:	package/exiv2/
 F:	package/nvidia-tegra23/nvidia-tegra23-binaries/
@@ -1562,10 +1496,7 @@ F:	package/python-functools32/
 F:	package/python-ipaddr/
 F:	package/python-pam/
 F:	package/python-psutil/
-F:	package/python-request-id/
 F:	package/python-texttable/
-F:	package/python-validators/
-F:	package/python-webob/
 F:	package/python-websocket-client/
 F:	package/triggerhappy/

@@ -1628,9 +1559,6 @@ F:	package/lttng-tools/
 F:	package/python-ipython/
 F:	package/liburcu/

-N:	Pierre Ducroquet <pinaraf@pinaraf.info>
-F:	package/kf5/
-
 N:	Pierre Floury <pierre.floury@gmail.com>
 F:	package/trace-cmd/

@@ -1662,9 +1590,6 @@ N:	Rahul Jain <rahul.jain@imgtec.com>
 F:	package/uhttpd/
 F:	package/ustream-ssl/

-N:	Rémi Rérolle <remi.rerolle@gmail.com>
-F:	package/libfreeimage/
-
 N:	Renaud Aubin <root@renaud.io>
 F:	package/libhttpparser/

@@ -1725,9 +1650,6 @@ F:	package/tk/
 F:	package/upower/
 F:	package/xenomai/

-N:	Roman Gorbenkov <roman.gorbenkov@ens2m.org>
-F:	package/davfs2/
-
 N:	Ryan Barnett <ryan.barnett@rockwellcollins.com>
 F:	package/atftp/
 F:	package/miraclecast/
@@ -1746,6 +1668,9 @@ F:	package/mariadb/
 N:	Ryan Wilkins <ryan@deadfrog.net>
 F:	package/biosdevname/

+N:	Rémi Rérolle <remi.rerolle@gmail.com>
+F:	package/libfreeimage/
+
 N:	Sam Bobroff <sam.bobroff@au1.ibm.com>
 F:	arch/Config.in.powerpc
 F:	package/librtas/
@@ -1781,12 +1706,6 @@ F:	package/kyua/
 F:	package/lutok/
 F:	package/yaml-cpp/

-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:	Semyon Kolganov <semenak94@mail.ru>
 F:	package/fmt/
 F:	package/libbson/
@@ -1870,6 +1789,14 @@ F:	package/mesa3d-demos/
 F:	package/sunxi-mali/
 F:	package/ti-gfx/

+N:	Stefan Fröberg <stefan.froberg@petroprogram.com>
+F:	package/elfutils/
+F:	package/libtasn1/
+F:	package/proxychains-ng/
+F:	package/vte/
+F:	package/yasm/
+F:	package/zlib-ng/
+
 N:	Stefan Sørensen <stefan.sorensen@spectralink.com>
 F:	package/cracklib/
 F:	package/libpwquality/
@@ -1911,11 +1838,18 @@ F:	package/lcdproc/
 F:	package/python-influxdb/

 N:	Sven Neumann <neumann@teufel.de>
-F:	package/glib-networking/
 F:	package/gstreamer1/gst1-libav/
+
+N:	Sven Neumann <s.neumann@raumfeld.com>
+F:	package/glib-networking/
 F:	package/libmms/
 F:	package/orc/
-F:	package/wampcc/
+
+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/
@@ -1936,17 +1870,6 @@ F:	package/civetweb/
 N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
 F:	package/opkg-utils/
-F:	package/perl-convert-asn1/
-F:	package/perl-crypt-blowfish/
-F:	package/perl-crypt-cbc/
-F:	package/perl-digest-md5/
-F:	package/perl-mime-base64-urlsafe/
-F:	package/perl-mojolicious-plugin-authentication/
-F:	package/perl-net-ping/
-F:	package/perl-net-snmp/
-F:	package/perl-net-ssh2/
-F:	package/perl-net-telnet/
-F:	package/pigz/
 F:	support/scripts/size-stats
 F:	utils/size-stats-compare
 F:	toolchain/
@@ -2016,7 +1939,7 @@ N:	Tzu-Jung Lee <roylee17@gmail.com>
 F:	package/dropwatch/
 F:	package/tstools/

-N:	Valentin Korenblit <valentinkorenblit@gmail.com>
+N:	Valentin Korenblit <valentin.korenblit@smile.fr>
 F:	package/clang/
 F:	package/llvm/

@@ -2165,7 +2088,7 @@ F:	package/x11r7/xapp_xinput-calibrator/
 F:	package/zlog/
 F:	utils/scanpypi

-N:	Zoltan Gyarmati <zgyarmati@zgyarmati.de>
+N:	Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
 F:	package/crudini/
 F:	package/grantlee/
 F:	package/proj/
--- a/26
+++ b/26
@@ -60,11 +60,6 @@ override O := $(patsubst %/,%,$(patsubst %.,%,$(O)))
 # avoid empty CANONICAL_O in case on non-existing entry.
 CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O))

-# gcc fails to build when the srcdir contains a '@'
-ifneq ($(findstring @,$(CANONICAL_O)),)
-$(error The build directory can not contain a '@')
-endif
-
 CANONICAL_CURDIR = $(realpath $(CURDIR))

 REQ_UMASK = 0022
@@ -92,9 +87,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2018.08.4
+export BR2_VERSION := 2018.05.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1545299000
+BR2_VERSION_EPOCH = 1532040000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -351,14 +346,8 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \
 	    -e 's/macppc/powerpc/' \
 	    -e 's/sh.*/sh/' )

-# When adding a new host gcc version in Config.in,
-# update the HOSTCC_MAX_VERSION variable:
-HOSTCC_MAX_VERSION := 8
-
-HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \
-	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \
-	[ "$${V%% *}" -le $(HOSTCC_MAX_VERSION) ] || V=$(HOSTCC_MAX_VERSION); \
-	printf "%s" "$${V}")
+HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \
+	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p')

 # For gcc >= 5.x, we only need the major version.
 ifneq ($(firstword $(HOSTCC_VERSION)),4)
@@ -988,8 +977,7 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
 # displayed.
 .PHONY: printvars
 printvars:
-	@:
-	$(foreach V, \
+	@:$(foreach V, \
 		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
@@ -1032,8 +1020,8 @@ 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 on the command line, is used as input'
+	@echo '  defconfig              - New config with default answer to all options'
+	@echo '                             BR2_DEFCONFIG, if set, 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'
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -15,6 +15,9 @@ config BR2_ARCH_HAS_MMU_MANDATORY
 config BR2_ARCH_HAS_MMU_OPTIONAL
 	bool

+config BR2_ARCH_HAS_FDPIC_SUPPORT
+	bool
+
 choice
 	prompt "Target Architecture"
 	default BR2_i386
@@ -279,10 +282,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6

-config BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -341,6 +340,7 @@ config BR2_READELF_ARCH_NAME
 choice
 	prompt "Target Binary Format"
 	default BR2_BINFMT_ELF if BR2_USE_MMU
+	default BR2_BINFMT_FDPIC if BR2_ARCH_HAS_FDPIC_SUPPORT
 	default BR2_BINFMT_FLAT

 config BR2_BINFMT_ELF
@@ -352,6 +352,16 @@ config BR2_BINFMT_ELF
 	  and executables used across different architectures and
 	  operating systems.

+config BR2_BINFMT_FDPIC
+	bool "FDPIC"
+	depends on BR2_ARCH_HAS_FDPIC_SUPPORT
+	select BR2_BINFMT_SUPPORTS_SHARED
+	help
+	  ELF FDPIC binaries are based on ELF, but allow the individual
+	  load segments of a binary to be located in memory
+	  independently of each other. This makes this format ideal for
+	  use in environments where no MMU is available.
+
 config BR2_BINFMT_FLAT
 	bool "FLAT"
 	depends on !BR2_USE_MMU
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -6,21 +6,12 @@ config BR2_ARM_CPU_HAS_NEON
 config BR2_ARM_CPU_MAYBE_HAS_NEON
 	bool

-# For some cores, the FPU is optional
-config BR2_ARM_CPU_MAYBE_HAS_FPU
-	bool
-
-config BR2_ARM_CPU_HAS_FPU
-	bool
-
 # for some cores, VFPv2 is optional
 config BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	bool
-	select BR2_ARM_CPU_MAYBE_HAS_FPU

 config BR2_ARM_CPU_HAS_VFPV2
 	bool
-	select BR2_ARM_CPU_HAS_FPU

 # for some cores, VFPv3 is optional
 config BR2_ARM_CPU_MAYBE_HAS_VFPV3
@@ -40,24 +31,6 @@ config BR2_ARM_CPU_HAS_VFPV4
 	bool
 	select BR2_ARM_CPU_HAS_VFPV3

-# FPv4 is always optional
-config BR2_ARM_CPU_MAYBE_HAS_FPV4
-	bool
-	select BR2_ARM_CPU_MAYBE_HAS_FPU
-
-config BR2_ARM_CPU_HAS_FPV4
-	bool
-	select BR2_ARM_CPU_HAS_FPU
-
-# FPv5 is always optional
-config BR2_ARM_CPU_MAYBE_HAS_FPV5
-	bool
-	select BR2_ARM_CPU_MAYBE_HAS_FPV4
-
-config BR2_ARM_CPU_HAS_FPV5
-	bool
-	select BR2_ARM_CPU_HAS_FPV4
-
 config BR2_ARM_CPU_HAS_FP_ARMV8
 	bool
 	select BR2_ARM_CPU_HAS_VFPV4
@@ -267,14 +240,7 @@ config BR2_cortex_m3
 config BR2_cortex_m4
 	bool "cortex-M4"
 	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_MAYBE_HAS_FPV4
 	select BR2_ARM_CPU_ARMV7M
-config BR2_cortex_m7
-	bool "cortex-M7"
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_MAYBE_HAS_FPV5
-	select BR2_ARM_CPU_ARMV7M
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 endif # !BR2_ARCH_IS_64

 comment "armv8 cores"
@@ -479,9 +445,7 @@ config BR2_ARM_ENABLE_NEON

 config BR2_ARM_ENABLE_VFP
 	bool "Enable VFP extension support"
-	depends on BR2_ARM_CPU_MAYBE_HAS_FPU
-	select BR2_ARM_CPU_HAS_FPV5 if BR2_ARM_CPU_MAYBE_HAS_FPV5
-	select BR2_ARM_CPU_HAS_FPV4 if BR2_ARM_CPU_MAYBE_HAS_FPV4
+	depends on BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	select BR2_ARM_CPU_HAS_VFPV4 if BR2_ARM_CPU_MAYBE_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_VFPV3 if BR2_ARM_CPU_MAYBE_HAS_VFPV3
 	select BR2_ARM_CPU_HAS_VFPV2 if BR2_ARM_CPU_MAYBE_HAS_VFPV2
@@ -492,7 +456,7 @@ config BR2_ARM_ENABLE_VFP

 choice
 	prompt "Target ABI"
-	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_FPU
+	default BR2_ARM_EABIHF if BR2_ARM_CPU_HAS_VFPV2
 	default BR2_ARM_EABI
 	depends on BR2_arm || BR2_armeb
 	help
@@ -527,7 +491,7 @@ config BR2_ARM_EABI

 config BR2_ARM_EABIHF
 	bool "EABIhf"
-	depends on BR2_ARM_CPU_HAS_FPU
+	depends on BR2_ARM_CPU_HAS_VFPV2
 	help
 	  The EABIhf is an extension of EABI which supports the 'hard'
 	  floating point model. This model uses the floating point
@@ -548,12 +512,10 @@ endchoice
 choice
 	prompt "Floating point strategy"
 	default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8
-	default BR2_ARM_FPU_FPV5D16 if BR2_ARM_CPU_HAS_FPV5
-	default BR2_ARM_FPU_FPV4D16 if BR2_ARM_CPU_HAS_FPV4
 	default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4
 	default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3
 	default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2
-	default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_FPU
+	default BR2_ARM_SOFT_FLOAT if !BR2_ARM_CPU_HAS_VFPV2

 config BR2_ARM_SOFT_FLOAT
 	bool "Soft float"
@@ -660,38 +622,6 @@ config BR2_ARM_FPU_NEON_VFPV4
 	  example on Cortex-A5 and Cortex-A7, support for VFPv4 and
 	  NEON is optional.

-config BR2_ARM_FPU_FPV4D16
-	bool "FPv4-D16"
-	depends on BR2_ARM_CPU_HAS_FPV4
-	help
-	  This option allows to use the FPv4-SP (single precision)
-	  floating point unit, as available in some ARMv7m processors
-	  (Cortex-M4).
-
-config BR2_ARM_FPU_FPV5D16
-	bool "FPv5-D16"
-	depends on BR2_ARM_CPU_HAS_FPV5
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-	help
-	  This option allows to use the FPv5-SP (single precision)
-	  floating point unit, as available in some ARMv7m processors
-	  (Cortex-M7).
-
-	  Note that if you want binary code that works on the earlier
-	  Cortex-M4, you should instead select FPv4-D16.
-
-config BR2_ARM_FPU_FPV5DPD16
-	bool "FPv5-DP-D16"
-	depends on BR2_ARM_CPU_HAS_FPV5
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-	help
-	  This option allows to use the FPv5-DP (double precision)
-	  floating point unit, as available in some ARMv7m processors
-	  (Cortex-M7).
-
-	  Note that if you want binary code that works on the earlier
-	  Cortex-M4, you should instead select FPv4-D16.
-
 config BR2_ARM_FPU_FP_ARMV8
 	bool "FP-ARMv8"
 	depends on BR2_ARM_CPU_HAS_FP_ARMV8
@@ -786,7 +716,6 @@ config BR2_GCC_TARGET_CPU
 	# armv7m
 	default "cortex-m3"	if BR2_cortex_m3
 	default "cortex-m4"	if BR2_cortex_m4
-	default "cortex-m7"	if BR2_cortex_m7
 	# armv8a
 	default "cortex-a32"	if BR2_cortex_a32
 	default "cortex-a35"	if BR2_cortex_a35
@@ -824,9 +753,6 @@ config BR2_GCC_TARGET_FPU
 	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 "fpv4-sp-d16"   if BR2_ARM_FPU_FPV4D16
-	default "fpv5-sp-d16"	if BR2_ARM_FPU_FPV5D16
-	default "fpv5-d16"	if BR2_ARM_FPU_FPV5DPD16
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
 	depends on BR2_arm || BR2_armeb
--- a/board/amarula/vyasa/genimage.cfg
+++ b/board/amarula/vyasa/genimage.cfg
@@ -12,7 +12,6 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "u-boot-dtb.img"
 		offset = 8M
-		size = 30M # falcon mode: args @ 16M args, uImage @ 17M
 	}

 	partition rootfs {
--- a/board/boundarydevices/common/6x_bootscript.txt
+++ b/board/boundarydevices/common/6x_bootscript.txt
@@ -0,0 +1,131 @@
+setenv bootargs ''
+
+if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then
+	a_script=0x80800000
+	a_zImage=0x80800000
+	a_fdt=0x83000000
+	m4=''
+	if itest.s "x1" == "x$m4enabled" ; then
+		run m4boot;
+		m4='-m4';
+	fi
+else
+	a_script=0x10800000
+	a_zImage=0x10800000
+	a_fdt=0x13000000
+fi
+
+setenv initrd_high 0xffffffff
+if itest.s "x" == "x${dtbname}" ; then
+	if itest.s x6SOLO == "x${cpu}" ; then
+		dtbname=imx6dl-${board}.dtb;
+	elif itest.s x6DL == "x${cpu}" ; then
+		dtbname=imx6dl-${board}.dtb;
+	elif itest.s x6QP == "x${cpu}" ; then
+		dtbname=imx6qp-${board}.dtb;
+	elif itest.s x6SX == "x${cpu}" ; then
+		dtbname=imx6sx-${board}${m4}.dtb;
+	elif itest.s x7D == "x${cpu}" ; then
+		dtbname=imx7d-${board}${m4}.dtb;
+	else
+		dtbname=imx6q-${board}.dtb;
+	fi
+fi
+
+if load ${dtype} ${disk}:1 ${a_script} uEnv.txt ; then
+    env import -t ${a_script} ${filesize}
+fi
+
+if itest.s x == x${bootdir} ; then
+	bootdir=/boot/
+fi
+
+if itest.s x${bootpart} == x ; then
+	bootpart=1
+fi
+
+if load ${dtype} ${disk}:${bootpart} ${a_fdt} ${bootdir}${dtbname} ; then
+	fdt addr ${a_fdt}
+	setenv fdt_high 0xffffffff
+else
+	echo "!!!! Error loading ${bootdir}${dtbname}";
+	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_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
+
+setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc"
+
+if test "sata" = "${dtype}" ; then
+	setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ;
+elif test "usb" = "${dtype}" ; then
+	setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ;
+else
+	setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bootpart}"
+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${show_fdt}" ; then
+	fdt print /
+fi
+
+if itest.s "x" != "x${show_env}" ; then
+	printenv
+fi
+
+if load ${dtype} ${disk}:${bootpart} ${a_zImage} ${bootdir}/zImage ; then
+	bootz ${a_zImage} - ${a_fdt}
+fi
+echo "Error loading kernel image"
--- a/board/boundarydevices/common/6x_upgrade.txt
+++ b/board/boundarydevices/common/6x_upgrade.txt
@@ -0,0 +1,69 @@
+if itest.s a$uboot_defconfig == a; then
+        echo "Please set uboot_defconfig to the appropriate value"
+        exit
+fi
+
+offset=0x400
+a_uImage1=0x12000000
+a_uImage2=0x12400000
+
+if itest.s x6SX == "x${cpu}" || itest.s x7D == "x${cpu}"; then
+	a_uImage1=0x82000000
+	a_uImage2=0x82400000
+fi
+
+setenv stdout serial,vga
+echo "check U-Boot" ;
+
+if load ${dtype} ${disk}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then
+else
+	echo "No U-Boot image found on SD card" ;
+	exit
+fi
+echo "read $filesize bytes from SD card" ;
+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 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" ;
+	exit
+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 0xC0000 ;
+
+# 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 ;
+
+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
+while echo "---- U-Boot upgraded. reset" ; do
+	sleep 120
+done
--- a/board/boundarydevices/common/boot.cmd
+++ b/board/boundarydevices/common/boot.cmd
@@ -2,8 +2,6 @@ setenv bootargs ''

 setenv initrd_high 0xffffffff
 m4=''
-kernelimage=zImage
-bootcommand=bootz
 a_base=0x10000000
 if itest.s x51 == "x${imx_cpu}" ; then
 	a_base=0x90000000
@@ -11,14 +9,10 @@ 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
-elif itest.s x8MQ == "x${imx_cpu}"; then
-	a_base=0x40000000
-	kernelimage=Image
-	bootcommand=booti
-fi
-if itest.s "x1" == "x${m4enabled}" ; then
-	run m4boot;
-	m4='-m4';
+	if itest.s "x1" == "x$m4enabled" ; then
+		run m4boot;
+		m4='-m4';
+	fi
 fi

 setexpr a_script  ${a_base} + 0x00800000
@@ -45,12 +39,10 @@ if itest.s "x" == "x${fdt_file}" ; then
 		fdt_file=imx6sx-${board}${m4}.dtb;
 	elif itest.s x7D == "x${imx_cpu}" ; then
 		fdt_file=imx7d-${board}${m4}.dtb;
-	elif itest.s x8MQ == "x${imx_cpu}" ; then
-		fdt_file=imx8mq-${board}${m4}.dtb;
 	elif itest.s x51 == "x${imx_cpu}" ; then
-		fdt_file=imx51-${board}.dtb;
+		fdt_file=imx51-${board}${m4}.dtb;
 	elif itest.s x53 == "x${imx_cpu}" ; then
-		fdt_file=imx53-${board}.dtb;
+		fdt_file=imx53-${board}${m4}.dtb;
 	else
 		fdt_file=imx6q-${board}.dtb;
 	fi
@@ -74,12 +66,16 @@ else
 	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";
@@ -91,18 +87,25 @@ 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_mipi}" ; then
-	run cmd_mipi
+
+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
@@ -123,6 +126,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
@@ -145,7 +149,7 @@ if itest.s "x" != "x${show_env}" ; then
 	printenv
 fi

-if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}${kernelimage} ; then
-	${bootcommand} ${a_zImage} - ${a_fdt}
+if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}zImage ; then
+	bootz ${a_zImage} - ${a_fdt}
 fi
 echo "Error loading kernel image"
--- a/board/boundarydevices/common/post-build.sh
+++ b/board/boundarydevices/common/post-build.sh
@@ -6,24 +6,20 @@
 #

 BOARD_DIR="$(dirname $0)"
-UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/.*\"\(.*\)\"/\1/')"
-
-if grep -Eq "^BR2_aarch64=y$" ${BR2_CONFIG}; then
-	MKIMAGE_ARCH=arm64
-	UBOOT_BINARY=imx8-boot-sd.bin
-else
-	MKIMAGE_ARCH=arm
-	UBOOT_BINARY=u-boot.imx
-fi

 # bd u-boot looks for standard bootscript
-$HOST_DIR/bin/mkimage -A $MKIMAGE_ARCH -O linux -T script -C none -a 0 -e 0 \
-    -n "boot script" -d $BOARD_DIR/boot.cmd $TARGET_DIR/boot/boot.scr
+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/$UBOOT_BINARY ]; then
-    install -D -m 0644 $BINARIES_DIR/$UBOOT_BINARY \
-        $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG
-    $HOST_DIR/bin/mkimage -A $MKIMAGE_ARCH -O linux -T script -C none -a 0 -e 0 \
-        -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr
+if [ -e $BINARIES_DIR/u-boot.imx ];
+then
+    install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx
+    $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
--- a/board/boundarydevices/common/upgrade.cmd
+++ b/board/boundarydevices/common/upgrade.cmd
@@ -7,7 +7,6 @@ offset=0x400
 erase_size=0xC0000
 qspi_offset=0x0
 a_base=0x12000000
-block_size=0x200

 if itest.s x51 == "x${imx_cpu}"; then
 	a_base=0x92000000
@@ -15,9 +14,6 @@ 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
-elif itest.s x8MQ == "x${imx_cpu}"; then
-	a_base=0x42000000
-	offset=0x8400
 fi

 qspi_match=1
@@ -29,54 +25,6 @@ setexpr a_script ${a_base}

 setenv stdout serial,vga

-if itest.s "x${sfname}" == "x" ; then
-# U-Boot resides in (e)MMC
-if itest.s "x${env_dev}" == "x" || itest.s "x${env_part}" == "x"; then
-        echo "Please set env_dev/part to the appropriate values"
-        exit
-fi
-
-# Load bootloader binary for this board
-if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_uImage1} u-boot.$uboot_defconfig ; then
-else
-	echo "File u-boot.$uboot_defconfig not found on SD card" ;
-	exit
-fi
-
-# Compute block count for filesize and offset
-setexpr cntoffset ${offset} / ${block_size}
-setexpr cntfile ${filesize} / ${block_size}
-# Add 1 in case the $filesize is not a multiple of $block_size
-setexpr cntfile ${cntfile} + 1
-
-# Select media partition (if different from main partition)
-mmc dev ${env_dev} ${env_part}
-
-# Read and compare current U-Boot
-mmc read ${a_uImage2} ${cntoffset} ${cntfile}
-if cmp.b ${a_uImage1} ${a_uImage2} ${filesize} ; then
-	echo "------- U-Boot versions match" ;
-	exit ;
-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
-mmc write ${a_uImage1} ${cntoffset} ${cntfile}
-
-# Make sure to boot from the proper partition
-if itest ${env_part} != 0 ; then
-	mmc partconf ${env_dev} 1 ${env_part} 0
-fi
-
-# Switch back to main eMMC partition (to avoid confusion)
-mmc dev ${env_dev}
-
-else
-# U-Boot resides in NOR flash
 if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then
 	echo "probed SPI ROM" ;
 else
@@ -84,13 +32,9 @@ else
 	exit
 fi

-if itest.s "x${sfname}" == "xat45db041d" ; then
-	erase_size=0x7e000
-fi
-
 if itest.s x7D == "x${imx_cpu}"; then
 	echo "check qspi parameter block" ;
-	if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then
+	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
@@ -119,7 +63,7 @@ fi

 echo "check U-Boot" ;

-if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_uImage1} u-boot.$uboot_defconfig ; then
+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
@@ -136,7 +80,7 @@ if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
 	if itest.s "${qspi_match}" == "1" ; then
 		echo "------- upgrade not needed" ;
 		if itest.s "x" != "x${next}" ; then
-			if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then
+			if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
 				source ${a_script}
 			else
 				echo "${next} not found on SD card"
@@ -198,14 +142,13 @@ if itest.s x7D == "x${imx_cpu}"; then
 fi

 if itest.s "x" != "x${next}" ; then
-	if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then
+	if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
 		source ${a_script}
 	else
-		echo "${next} not found on ${devtype} ${devnum}:${distro_bootpart}"
+		echo "${next} not found on ${devtype} ${devnum}"
 	fi
 fi
-fi

-while echo "---- U-Boot upgraded. Please reset the board" ; do
+while echo "---- U-Boot upgraded. reset" ; do
 	sleep 120
 done
--- a/board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch
+++ b/board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch
@@ -1,66 +0,0 @@
-From b3a1e97498e7987073775d49a703932c20f2df1d Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel@collabora.com>
-Date: Mon, 12 Nov 2018 14:04:46 -0300
-Subject: [PATCH] mips: Remove default endiannes
-
-Currently, trying to build ci20_mmc fails on little-endian
-toolchains. The problem seems to be that some targets don't
-have CONFIG_SYS_LITTLE_ENDIAN properly set, and therefore
-the default -EB switch is selected.
-
-Let's get rid of the default switch entirely, and fix this problem.
-While this may be a hack, it is a quick solution until
-U-Boot gets CI20 proper support.
-
-make ARCH=mips CROSS_COMPILE=mips-linux-gnu- ci20_mmc
-Configuring for ci20_mmc - Board: ci20, Options: SPL_MMC_SUPPORT,ENV_IS_IN_MMC
-make
-make[1]: Entering directory '/home/zeta/repos/u-boot-ci20'
-Generating include/autoconf.mk
-Generating include/autoconf.mk.dep
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-Generating include/spl-autoconf.mk
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-Generating include/tpl-autoconf.mk
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-mips-linux-gnu-gcc -DDO_DEPS_ONLY \
-	-g  -Os   -ffunction-sections -fdata-sections -D__KERNEL__ -I/home/zeta/repos/u-boot-ci20/include -fno-builtin -ffreestanding -nostdinc -isystem /home/zeta/repos/buildroot/mips/output/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -EB -msoft-float -fpic -mabicalls -march=mips32 -mabi=32 -DCONFIG_32BIT -mno-branch-likely -Wall -Wstrict-prototypes       \
-	-o lib/asm-offsets.s lib/asm-offsets.c -c -S
-if [ -f arch/mips/cpu/xburst/jz4780/asm-offsets.c ];then \
-	mips-linux-gnu-gcc -DDO_DEPS_ONLY \
-	-g  -Os   -ffunction-sections -fdata-sections -D__KERNEL__ -I/home/zeta/repos/u-boot-ci20/include -fno-builtin -ffreestanding -nostdinc -isystem /home/zeta/repos/buildroot/mips/output/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/include -pipe  -DCONFIG_MIPS -D__MIPS__ -G 0 -EB -msoft-float -fpic -mabicalls -march=mips32 -mabi=32 -DCONFIG_32BIT -mno-branch-likely -Wall -Wstrict-prototypes       \
-		-o arch/mips/cpu/xburst/jz4780/asm-offsets.s arch/mips/cpu/xburst/jz4780/asm-offsets.c -c -S; \
-else \
-	touch arch/mips/cpu/xburst/jz4780/asm-offsets.s; \
-fi
-mips-linux-gnu-gcc: error: may not use both -EB and -EL
-make[1]: *** [Makefile:747: lib/asm-offsets.s] Error 1
-make[1]: *** Waiting for unfinished jobs....
-make[1]: Leaving directory '/home/zeta/repos/u-boot-ci20'
-make: *** [.boards.depend:463: ci20_mmc] Error 2
-
-Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
-https://github.com/MIPS/CI20_u-boot/pull/19
-
- arch/mips/config.mk | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/arch/mips/config.mk b/arch/mips/config.mk
-index c89279025507..43560abbc0e1 100644
--- a/arch/mips/config.mk
-+++ b/arch/mips/config.mk
-@@ -20,9 +20,6 @@ ifdef CONFIG_SYS_BIG_ENDIAN
- ENDIANNESS := -EB
- endif
- 
-# Default to EB if no endianess is configured
-ENDIANNESS ?= -EB
-
- PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
- 
- #
-- 
-2.19.1
-
--- a/board/freescale/common/imx/genimage.cfg.template
+++ b/board/freescale/common/imx/genimage.cfg.template
@@ -22,7 +22,7 @@ image sdcard.img {

  partition u-boot {
    in-partition-table = "no"
-    image = "%UBOOTBIN%"
+    image = "u-boot.imx"
    offset = 1024
  }

--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -2,13 +2,9 @@

 main ()
 {
-	UBOOT_DTB=$2
-	if [ ! -e "$UBOOT_DTB" ]; then
-		echo "ERROR: couldn't find dtb: $UBOOT_DTB"
-		exit 1
-	fi
+	# Currently we support imx8mqevk.
 	cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-	BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
+	BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${BINARIES_DIR}/fsl-imx8mq-evk.dtb > ${BINARIES_DIR}/u-boot.its
 	${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
 	rm -f ${BINARIES_DIR}/u-boot.its

--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -41,24 +41,13 @@ genimage_type()
 	fi
 }

-uboot_image()
-{
-	if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then
-		echo "u-boot-dtb.imx"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then
-		echo "u-boot.imx"
-	fi
-}
-
 main()
 {
 	local FILES="$(dtb_list) $(linux_image)"
-	local UBOOTBIN="$(uboot_image)"
 	local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)"
 	local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

 	sed -e "s/%FILES%/${FILES}/" \
-		-e "s/%UBOOTBIN%/${UBOOTBIN}/" \
 		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}

 	rm -rf "${GENIMAGE_TMP}"
--- a/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch
+++ b/board/freescale/imx6sabre/patches/uboot/0002-imx-Create-distinct-pre-processed-mkimage-config-fil.patch
@@ -1,89 +0,0 @@
-From 27a2cd6a1980adf3002412678c8fdec6528dc47d Mon Sep 17 00:00:00 2001
-From: Trent Piepho <tpiepho@impinj.com>
-Date: Fri, 6 Apr 2018 17:11:27 -0700
-Subject: [PATCH] imx: Create distinct pre-processed mkimage config files
-
-Each imx image is created by a separate sub-make and during this process
-the mkimage config file is run though cpp.
-
-The cpp output is to the same file no matter what imx image is being
-created.
-
-This means if two imx images are generated in parallel they will attempt
-to independently produce the same pre-processed mkimage config file at
-the same time.
-
-Avoid the problem by making the pre-processed config file name unique
-based on the imx image it will be used in.  This way each image will
-create a unique config file and they won't clobber each other when run
-in parallel.
-
-This should fixed the build bug referenced in b5b0e4e3 ("imximage:
-Remove failure when no IVT offset is found").
-
-Cc: Breno Lima <breno.lima@nxp.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Cc: Fabio Estevam <fabio.estevam@nxp.com>
-Signed-off-by: Trent Piepho <tpiepho@impinj.com>
-Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
-[fabio: Adapted to imx_v2017.03_4.9.11_1.0.0_ga]
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
- arch/arm/imx-common/Makefile | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
-index d862258..f1bae8d 100644
--- a/arch/arm/imx-common/Makefile
-+++ b/arch/arm/imx-common/Makefile
-@@ -69,9 +69,11 @@ endif
- quiet_cmd_cpp_cfg = CFGS    $@
-       cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
- 
-IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%).cfgtmp
-+# mkimage source config file
-+IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)
- 
-$(IMX_CONFIG): %.cfgtmp: % FORCE
-+# How to create a cpp processed config file, they all use the same source
-+%.cfgout: $(IMX_CONFIG) FORCE
- 	$(Q)mkdir -p $(dir $@)
- 	$(call if_changed_dep,cpp_cfg)
- 
-@@ -79,7 +81,7 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imxim
- 	-e $(CONFIG_SYS_TEXT_BASE)
- u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
- 
-u-boot.imx: u-boot.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
- ifeq ($(CONFIG_OF_SEPARATE),y)
-@@ -87,16 +89,15 @@ MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T i
- 	-e $(CONFIG_SYS_TEXT_BASE)
- u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log
- 
-u-boot-dtb.imx: u-boot-dtb.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- endif
- 
- MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
- 	-e $(CONFIG_SPL_TEXT_BASE)
-
- SPL: MKIMAGEOUTPUT = SPL.log
- 
-SPL: spl/u-boot-spl.bin $(IMX_CONFIG) $(PLUGIN).bin FORCE
-+SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE
- 	$(call if_changed,mkimage)
- 
- MKIMAGEFLAGS_u-boot.uim = -A arm -O U-Boot -a $(CONFIG_SYS_TEXT_BASE) \
-@@ -124,4 +125,4 @@ cmd_u-boot-nand-spl_imx = (printf '\000\000\000\000\106\103\102\040\001' && \
- spl/u-boot-nand-spl.imx: SPL FORCE
- 	$(call if_changed,u-boot-nand-spl_imx)
- 
-targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-spl.imx)
-+targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx)
-- 
-2.7.4
-
--- a/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch
+++ b/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
+
--- a/board/freescale/imx8mqevk/readme.txt
+++ b/board/freescale/imx8mqevk/readme.txt
@@ -5,6 +5,12 @@ Freescale i.MX8MQ EVK board
 This file documents the Buildroot support for the Freescale i.MX8MQ
 EVK board.

+Hardware support
+================
+
+Currently only basic support for hardware is available, currently no
+support for GPU, VPU and other HW features.
+
 Build
 =====

--- a/board/olimex/a10_olinuxino/boot.cmd
+++ b/board/olimex/a10_olinuxino/boot.cmd
@@ -1 +0,0 @@
-../a20_olinuxino/boot.cmd
--- a/board/olimex/a10_olinuxino/genimage.cfg
+++ b/board/olimex/a10_olinuxino/genimage.cfg
@@ -1 +0,0 @@
-../a20_olinuxino/genimage.cfg
--- a/board/olimex/a10_olinuxino/post-build.sh
+++ b/board/olimex/a10_olinuxino/post-build.sh
@@ -1 +0,0 @@
-../a20_olinuxino/post-build.sh
--- a/board/olimex/a10_olinuxino/readme.txt
+++ b/board/olimex/a10_olinuxino/readme.txt
@@ -1,57 +0,0 @@
-A10-OLinuXino-LIME
-
-Intro
-=====
-
-These are open hardware boards, all based on the Allwinner A10 SoC.
-
-for more details about the boards see the following pages:
- - https://www.olimex.com/Products/OLinuXino/open-source-hardware
- - https://www.olimex.com/Products/OLinuXino/A10/A10-OLinuXino-LIME/
-
-The following defconfigs are available:
- - olimex_a10_olinuxino_lime_defconfig
-   for the A10-OLinuXino-LIME board using mainline kernel
-
-(see http://linux-sunxi.org/Linux_Kernel for more details)
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make <board>_defconfig
-
-Compile everything and build the rootfs image:
-
-    $ make
-
-Result of the build
-------------------
-
-After building, you should get a tree like this:
-
-    output/images/
-    +-- boot.scr
-    +-- rootfs.ext2
-    +-- rootfs.ext4 -> rootfs.ext2
-    +-- sdcard.img
-    +-- sun4i-a10-olinuxino-lime.dtb (lime, mainline)
-    +-- u-boot.bin
-    +-- u-boot-sunxi-with-spl.bin
-    `-- zImage
-
-
-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 uSD
-card:
-
-    # dd if=output/images/sdcard.img of=/dev/sdX
-
-Where 'sdX' is the device node of the uSD.
-
-Eject the SD card, insert it in the A10-OLinuXino board, and power it up.
-
--- a/board/orangepi/orangepi-lite/linux-extras.config
+++ b/board/orangepi/orangepi-lite/linux-extras.config
@@ -6,10 +6,3 @@ CONFIG_CFG80211_WEXT=y

 # wireless drivers
 CONFIG_WLAN=y
-
-# hdmi
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_SUN8I_DE2_CCU=y
-
-# analog audio
-CONFIG_SND_SUN8I_CODEC_ANALOG=y
--- a/board/orangepi/orangepi-pc/linux.fragment
+++ b/board/orangepi/orangepi-pc/linux.fragment
@@ -1,3 +0,0 @@
-CONFIG_DRM_SUN8I_DW_HDMI=y
-CONFIG_SUN8I_DE2_CCU=y
-CONFIG_SND_SUN8I_CODEC_ANALOG=y
--- a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch
+++ b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-enable-ap6212.patch
@@ -0,0 +1,73 @@
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Sun, 11 Feb 2018 16:21:43 +0300
+Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: enable AP6212a WiFi/BT combo
+
+Enable AP6212a WiFi/BT combo chip on orange-pi-zero-plus2 board:
+- WiFi SDIO interface is connected to MMC1
+- WiFi REG_ON pin connected to gpio PA9: attach to mmc-pwrseq
+- WiFi HOST_WAKE pin connected to gpio PL7
+- BT is connected to UART1
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ .../allwinner/sun50i-h5-orangepi-zero-plus2.dts    | 32 ++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+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 a42fd79a62a3..d415b7b67cce 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
+@@ -64,6 +64,13 @@
+ 		regulator-min-microvolt = <3300000>;
+ 		regulator-max-microvolt = <3300000>;
+ 	};
+
+	wifi_pwrseq: wifi_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		pinctrl-names = "default";
+		reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
+		post-power-on-delay-ms = <200>;
+	};
+ };
+ 
+ &mmc0 {
+@@ -75,6 +82,25 @@
+ 	status = "okay";
+ };
+ 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>;
+	vmmc-supply = <&reg_vcc3v3>;
+	vqmmc-supply = <&reg_vcc3v3>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+
+	brcmf: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&r_pio>;
+		interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>;	/* PL7 */
+		interrupt-names = "host-wake";
+	};
+};
+
+ &mmc2 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&mmc2_8bit_pins>;
+@@ -90,3 +116,9 @@
+ 	pinctrl-0 = <&uart0_pins_a>;
+ 	status = "okay";
+ };
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+	status = "okay";
+};
+-- 
+2.16.1
+
--- a/board/qemu/aarch64-virt/linux-4.15.config
+++ b/board/qemu/aarch64-virt/linux-4.15.config
--- a/board/qemu/aarch64-virt/readme.txt
+++ b/board/qemu/aarch64-virt/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.12.0
+Tested with QEMU 2.11.0
--- a/board/qemu/arm-versatile/linux-4.13.config
+++ b/board/qemu/arm-versatile/linux-4.13.config
--- a/board/qemu/arm-versatile/linux-4.4-nommu.config
+++ b/board/qemu/arm-versatile/linux-4.4-nommu.config
@@ -1,12 +1,11 @@
 # CONFIG_MMU is not set
 CONFIG_ARCH_VERSATILE=y
-CONFIG_ARM_SINGLE_ARCH_VERSATILE=y
 CONFIG_SET_MEM_PARAM=y
 CONFIG_DRAM_BASE=0x00000000
 CONFIG_DRAM_SIZE=0x08000000
 CONFIG_ARCH_VERSATILE_PB=y
 CONFIG_MACH_VERSATILE_AB=y
-CONFIG_MACH_VERSATILE_DT=y
+# CONFIG_MACH_VERSATILE_DT is not set
 CONFIG_BINFMT_FLAT=y
 CONFIG_SYSVIPC=y
 CONFIG_MODULES=y
--- a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
+++ b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
@@ -1,84 +1,30 @@
-Signed-Off-by: Waldemar Brodkorb <wbx@openadk.org>
-From LKML.
+From b7c1666813424d329868335c8faf8886b0f85b6c Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@linux-m68k.org>
+Date: Thu, 11 Aug 2016 21:33:11 +1000
+Subject: [PATCH] arm: fix versatile platform to work in no-MMU mode

-diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig
--- linux-4.15.13.orig/arch/arm/Kconfig	2018-03-24 11:02:53.000000000 +0100
-+++ linux-4.15.13/arch/arm/Kconfig	2018-04-01 03:47:33.415078244 +0100
-@@ -355,6 +355,17 @@
- 	select SPARSE_IRQ
- 	select USE_OF
+If CONFIG_MMU is disabled then do not carry out the virtual memory address
+translation for IO devices.
+
+With this fix in place we can run the ARM Versatile board (including its
+qemu emulation) as a no-MMU Linux system.
+
+Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h
+--- linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h	2016-08-10 11:49:43.000000000 +0200
+++ linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h	2016-08-25 23:19:03.691716292 +0200
+@@ -30,8 +30,12 @@
+ #define VERSATILE_PCI_VIRT_BASE		(void __iomem *)0xe8000000ul
+ #define VERSATILE_PCI_CFG_VIRT_BASE	(void __iomem *)0xe9000000ul
 
-+config ARM_SINGLE_ARCH_VERSATILE
-+	bool "ARM Ltd. Versatile family"
-+	depends on !MMU
-+	select AUTO_ZRELADDR
-+	select CLKSRC_OF
-+	select COMMON_CLK
-+	select GENERIC_CLOCKEVENTS
-+	select GPIOLIB
-+	select SPARSE_IRQ
-+	select USE_OF
-+
- config ARCH_EBSA110
- 	bool "EBSA-110"
- 	select ARCH_USES_GETTIMEOFFSET
-diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug
--- linux-4.15.13.orig/arch/arm/Kconfig.debug	2018-03-24 11:02:53.000000000 +0100
-+++ linux-4.15.13/arch/arm/Kconfig.debug	2018-04-01 03:47:33.416078232 +0100
-@@ -1795,7 +1795,8 @@
- config UNCOMPRESS_INCLUDE
- 	string
- 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
-					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
-+					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
-+					ARM_SINGLE_ARCH_VERSATILE
- 	default "mach/uncompress.h"
- 
- config EARLY_PRINTK
-diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h
--- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h	2018-03-24 11:02:53.000000000 +0100
-+++ linux-4.15.13/arch/arm/include/asm/mach/map.h	2018-04-01 03:47:17.587276119 +0100
-@@ -62,6 +62,7 @@
- #else
- #define iotable_init(map,num)	do { } while (0)
- #define vm_reserve_area_early(a,s,c)	do { } while (0)
-+#define debug_ll_io_init()	do { } while (0)
- #endif
- 
- #endif
-diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig
--- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig	2018-03-24 11:02:53.000000000 +0100
-+++ linux-4.15.13/arch/arm/mach-versatile/Kconfig	2018-04-01 03:47:33.417078219 +0100
-@@ -1,7 +1,8 @@
- # SPDX-License-Identifier: GPL-2.0
- config ARCH_VERSATILE
-	bool "ARM Ltd. Versatile family"
-	depends on ARCH_MULTI_V5
-+	bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5
-+	depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE
-+	default y if ARM_SINGLE_ARCH_VERSATILE
- 	select ARM_AMBA
- 	select ARM_TIMER_SP804
- 	select ARM_VIC
-diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot
--- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot	2018-04-01 03:47:25.644175394 +0100
-@@ -0,0 +1,3 @@
-+# Empty file waiting for deletion once Makefile.boot isn't needed any more.
-+# Patch waits for application at
-+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
-diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c
--- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c	2018-03-24 11:02:53.000000000 +0100
-+++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c	2018-04-01 03:47:10.913359555 +0100
-@@ -37,7 +37,11 @@
- #include <asm/mach/map.h>
- 
- /* macro to get at MMIO space when running virtually */
 +#ifdef CONFIG_MMU
+ /* macro to get at MMIO space when running virtually */
 #define IO_ADDRESS(x)		(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
 +#else
 +#define IO_ADDRESS(x)		(x)
 +#endif
+ 
 #define __io_address(n)		((void __iomem __force *)IO_ADDRESS(n))
 
- /*
--- a/board/qemu/arm-versatile/readme.txt
+++ b/board/qemu/arm-versatile/readme.txt
@@ -4,9 +4,9 @@ Run the emulation with:

 Or for the noMMU emulation:

-  qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111
+  qemu-system-arm -M versatilepb -kernel output/images/zImage -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111

 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/arm-vexpress/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/m68k-mcf5208/linux-4.11.config
+++ b/board/qemu/m68k-mcf5208/linux-4.11.config
--- a/board/qemu/m68k-mcf5208/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/m68k-q800/linux-4.11.config
+++ b/board/qemu/m68k-q800/linux-4.11.config
--- a/board/qemu/m68k-q800/readme.txt
+++ b/board/qemu/m68k-q800/readme.txt
@@ -4,5 +4,5 @@ Run the emulation with:

 The login prompt will appear in the terminal that started Qemu.

-Tested with QEMU 2.11.0 from https://github.com/vivier/qemu-m68k
-You need following branch: q800-v2.11.0
+Tested with QEMU 2.4.0 from https://github.com/vivier/qemu-m68k
+You need following branch: q800-v2.4.0
--- a/board/qemu/microblazebe-mmu/linux-4.11.config
+++ b/board/qemu/microblazebe-mmu/linux-4.11.config
--- a/board/qemu/microblazebe-mmu/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/microblazeel-mmu/linux-4.11.config
+++ b/board/qemu/microblazeel-mmu/linux-4.11.config
--- a/board/qemu/microblazeel-mmu/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/mips32r2-malta/linux-4.11.config
+++ b/board/qemu/mips32r2-malta/linux-4.11.config
--- a/board/qemu/mips32r2-malta/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/mips32r2el-malta/linux-4.11.config
+++ b/board/qemu/mips32r2el-malta/linux-4.11.config
--- a/board/qemu/mips32r2el-malta/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/mips32r6-malta/linux-4.11.config
+++ b/board/qemu/mips32r6-malta/linux-4.11.config
--- a/board/qemu/mips32r6-malta/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/mips32r6el-malta/linux-4.11.config
+++ b/board/qemu/mips32r6el-malta/linux-4.11.config
--- a/board/qemu/mips32r6el-malta/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/mips64-malta/linux-4.11.config
+++ b/board/qemu/mips64-malta/linux-4.11.config
--- a/board/qemu/mips64-malta/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/mips64el-malta/linux-4.11.config
+++ b/board/qemu/mips64el-malta/linux-4.11.config
--- a/board/qemu/mips64el-malta/readme.txt
+++ b/board/qemu/mips64el-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.12.0
+Tested with QEMU 2.5.0
--- a/board/qemu/mips64r6-malta/linux-4.11.config
+++ b/board/qemu/mips64r6-malta/linux-4.11.config
--- a/board/qemu/mips64r6-malta/readme.txt
+++ b/board/qemu/mips64r6-malta/readme.txt
@@ -4,4 +4,7 @@ Run the emulation with:

 The login prompt will appear in the terminal that started Qemu.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.7.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
--- a/board/qemu/mips64r6el-malta/linux-4.11.config
+++ b/board/qemu/mips64r6el-malta/linux-4.11.config
--- a/board/qemu/mips64r6el-malta/readme.txt
+++ b/board/qemu/mips64r6el-malta/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/nios2-10m50/linux-4.11.fragment
+++ b/board/qemu/nios2-10m50/linux-4.11.fragment
--- a/board/qemu/nios2-10m50/readme.txt
+++ b/board/qemu/nios2-10m50/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.12.0.
+Tested with QEMU 2.9.0.
--- a/board/qemu/or1k/readme.txt
+++ b/board/qemu/or1k/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu.

 Ethernet support is not working, yet.

-Tested with QEMU 2.12.0.
+Tested with QEMU 2.9.0.
--- a/board/qemu/ppc-g3beige/linux-4.11.config
+++ b/board/qemu/ppc-g3beige/linux-4.11.config
--- a/board/qemu/ppc-g3beige/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/ppc-mpc8544ds/linux-4.11.config
+++ b/board/qemu/ppc-mpc8544ds/linux-4.11.config
--- a/board/qemu/ppc-mpc8544ds/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/ppc-virtex-ml507/linux-4.9.config
+++ b/board/qemu/ppc-virtex-ml507/linux-4.9.config
--- a/board/qemu/ppc-virtex-ml507/readme.txt
+++ b/board/qemu/ppc-virtex-ml507/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.12.0
+Tested with QEMU 2.5.0
--- a/board/qemu/ppc64-e5500/readme.txt
+++ b/board/qemu/ppc64-e5500/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.12.0
+Tested with QEMU 2.0.0
--- a/board/qemu/ppc64-pseries/readme.txt
+++ b/board/qemu/ppc64-pseries/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/ppc64le-pseries/readme.txt
+++ b/board/qemu/ppc64le-pseries/readme.txt
@@ -4,4 +4,4 @@ qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -a

 The login prompt will appear in the terminal window.

-Tested with QEMU 2.12.0
+Tested with QEMU 2.10.0
--- a/board/qemu/sh4-r2d/linux-4.9.config
+++ b/board/qemu/sh4-r2d/linux-4.9.config
--- a/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch
+++ b/board/qemu/sh4-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch
@@ -1,61 +0,0 @@
-From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 15 Jun 2018 17:43:38 +0200
-Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for
- (H)SCIF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel)
-
-The last Qemu kernel update [1] introduced a regresion in sh4 SCIF
-serial device. Some keyboard presses are very slow to be taken into
-account, perhaps not even taken into account at all. This would
-explain why our test infrastructure doesn’t manage to login as root
-[2][3][4].
-
-git bisect reported a kernel patch from 4.11, increasing RX FIFO
-trigger defaults value for sh-sci (H)SCIF. The kernel patch itself
-looks good but the Qemu emulation is not ready to handle this new
-setting.
-
-From Qemu (2.12.0): target/sh4/README.sh4
-"Configuration of the second serial port (SCIF) is supported. FIFO
-handling infrastructure has been started but is not completed yet."
-
-In order to be able to test sh4 architecture with newer kernel,
-revert to the old behaviour.
-
-[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd
-[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425
-[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427
-[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- drivers/tty/serial/sh-sci.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index ab757546c6db..138e4dec44fb 100644
--- a/drivers/tty/serial/sh-sci.c
-+++ b/drivers/tty/serial/sh-sci.c
-@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev,
- 		sci_port->rx_trigger = 32;
- 		break;
- 	case PORT_SCIF:
-		if (p->regtype == SCIx_SH7705_SCIF_REGTYPE)
-			/* RX triggering not implemented for this IP */
-			sci_port->rx_trigger = 1;
-		else
-			sci_port->rx_trigger = 8;
-+		/* RX triggering not implemented in Qemu emulation */
-+		sci_port->rx_trigger = 1;
- 		break;
- 	default:
- 		sci_port->rx_trigger = 1;
-- 
-2.14.4
-
--- a/board/qemu/sh4-r2d/readme.txt
+++ b/board/qemu/sh4-r2d/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.12.0
+Tested with QEMU 2.5.0
--- a/board/qemu/sh4eb-r2d/linux-4.9.config
+++ b/board/qemu/sh4eb-r2d/linux-4.9.config
--- a/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch
+++ b/board/qemu/sh4eb-r2d/patches/linux/0001-Revert-serial-sh-sci-increase-RX-FIFO-trigger-defaul.patch
@@ -1,61 +0,0 @@
-From aaaced6d2d6f796ed77e4725ed7ccbedb189c180 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 15 Jun 2018 17:43:38 +0200
-Subject: [PATCH] Revert: serial: sh-sci: increase RX FIFO trigger defaults for
- (H)SCIF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 18e8cf159177100e69d528293f8cf6875c0b1bca (kernel)
-
-The last Qemu kernel update [1] introduced a regresion in sh4 SCIF
-serial device. Some keyboard presses are very slow to be taken into
-account, perhaps not even taken into account at all. This would
-explain why our test infrastructure doesn’t manage to login as root
-[2][3][4].
-
-git bisect reported a kernel patch from 4.11, increasing RX FIFO
-trigger defaults value for sh-sci (H)SCIF. The kernel patch itself
-looks good but the Qemu emulation is not ready to handle this new
-setting.
-
-From Qemu (2.12.0): target/sh4/README.sh4
-"Configuration of the second serial port (SCIF) is supported. FIFO
-handling infrastructure has been started but is not completed yet."
-
-In order to be able to test sh4 architecture with newer kernel,
-revert to the old behaviour.
-
-[1] https://git.buildroot.net/buildroot/commit/?id=03fb00f2175cdb4565e26fcb9b3da1c1059de1bd
-[2] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006425
-[3] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006427
-[4] https://gitlab.com/free-electrons/toolchains-builder/-/jobs/72006426
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
- drivers/tty/serial/sh-sci.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index ab757546c6db..138e4dec44fb 100644
--- a/drivers/tty/serial/sh-sci.c
-+++ b/drivers/tty/serial/sh-sci.c
-@@ -2793,11 +2793,8 @@ static int sci_init_single(struct platform_device *dev,
- 		sci_port->rx_trigger = 32;
- 		break;
- 	case PORT_SCIF:
-		if (p->regtype == SCIx_SH7705_SCIF_REGTYPE)
-			/* RX triggering not implemented for this IP */
-			sci_port->rx_trigger = 1;
-		else
-			sci_port->rx_trigger = 8;
-+		/* RX triggering not implemented in Qemu emulation */
-+		sci_port->rx_trigger = 1;
- 		break;
- 	default:
- 		sci_port->rx_trigger = 1;
-- 
-2.14.4
-
--- a/board/qemu/sh4eb-r2d/readme.txt
+++ b/board/qemu/sh4eb-r2d/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.12.0
+Tested with QEMU 2.5.0
--- a/board/qemu/sparc-ss10/linux-4.11.config
+++ b/board/qemu/sparc-ss10/linux-4.11.config
--- a/board/qemu/sparc-ss10/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/sparc64-sun4u/linux-4.11.config
+++ b/board/qemu/sparc64-sun4u/linux-4.11.config
--- a/board/qemu/sparc64-sun4u/readme.txt
+++ b/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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/x86/linux-4.15.config
+++ b/board/qemu/x86/linux-4.15.config
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -6,4 +6,4 @@ 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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/x86_64/linux-4.15.config
+++ b/board/qemu/x86_64/linux-4.15.config
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -6,4 +6,4 @@ 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.12.0
+Tested with QEMU 2.9.0
--- a/board/qemu/xtensa-lx60/linux-4.11-nommu.config
+++ b/board/qemu/xtensa-lx60/linux-4.11-nommu.config
--- a/board/qemu/xtensa-lx60/linux-4.11.config
+++ b/board/qemu/xtensa-lx60/linux-4.11.config
--- a/board/qemu/xtensa-lx60/readme.txt
+++ b/board/qemu/xtensa-lx60/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.12.0
+Tested with QEMU 2.9.0
--- a/board/raspberrypi/genimage-raspberrypi3-64.cfg
+++ b/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -2,7 +2,6 @@ image boot.vfat {
  vfat {
    files = {
      "bcm2710-rpi-3-b.dtb",
-      "bcm2710-rpi-3-b-plus.dtb",
      "bcm2837-rpi-3-b.dtb",
      "rpi-firmware/bootcode.bin",
      "rpi-firmware/cmdline.txt",
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -23,11 +23,11 @@ __EOF__
 		--aarch64)
 		# Run a 64bits kernel (armv8)
 		sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
-		if ! grep -qE '^arm_64bit=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+		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_64bit=1
+arm_control=0x200
 __EOF__
 		fi

--- a/board/sheevaplug/readme.txt
+++ b/board/sheevaplug/readme.txt
@@ -1,36 +0,0 @@
-Sheevaplug
-==========
-
-Once the build process is finished you will have the following files
-in the output/images/ directory:
-
- u-boot.kwb
- uImage.kirkwood-sheevaplug
- rootfs.jffs2
-
-Copy these to a TFTP server, connect ethernet and mini-USB cable and
-power up the board. Stop the board in U-Boot and update U-Boot by
-executing:
-
-setenv serverip <ipaddress-of-tftp-server>
-setenv bootfile <path/to/u-boot.kwb>
-bootp
-nand erase 0x0 0x80000
-nand write $fileaddr 0x0 0x80000
-reset
-
-Once the new U-Boot boots up, stop it again and update Linux kernel
-and rootfs by:
-
-setenv serverip <ipaddress-of-tftp-server>
-setenv bootfile <path/to/uImage.kirkwood-sheevaplug>
-bootp
-nand erase.part kernel
-nand write $fileaddr kernel 0x400000
-
-setenv bootfile <path/to/rootfs.jffs2>
-bootp
-nand erase.part rootfs
-nand write $fileaddr rootfs $filesize
-
-reset
--- a/board/solidrun/clearfog/boot.scr.txt
+++ b/board/solidrun/clearfog/boot.scr.txt
@@ -0,0 +1,5 @@
+setenv fdtfile armada-388-clearfog-base.dtb
+setenv bootargs root=/dev/mmcblk0p1
+load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}/${fdtfile}
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}/zImage
+bootz ${kernel_addr_r} - ${fdt_addr_r}
--- a/board/solidrun/clearfog/extlinux.conf
+++ b/board/solidrun/clearfog/extlinux.conf
@@ -1,4 +0,0 @@
-label Clearfog Linux
-  kernel /boot/zImage
-  devicetree /boot/armada-388-clearfog-base.dtb
-  append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait
--- a/board/solidrun/clearfog/post-build.sh
+++ b/board/solidrun/clearfog/post-build.sh
@@ -1,5 +1,3 @@
 #!/bin/sh

-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
+install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
--- a/board/solidrun/clearfog/readme.txt
+++ b/board/solidrun/clearfog/readme.txt
@@ -47,7 +47,7 @@ Buildroot prepares a bootable "sdcard.img" image in the output/images/
 directory, ready to be dumped on a microSD card. Launch the following
 command as root:

-  dd if=output/images/sdcard.img of=/dev/<your-microsd-device> conv=fdatasync
+  dd if=./output/images/sdcard.img of=/dev/<your-microsd-device>

 *** WARNING! The script will destroy all the card content. Use with care! ***

--- a/board/synopsys/axs10x/fs-overlay/etc/inittab
+++ b/board/synopsys/axs10x/fs-overlay/etc/inittab
@@ -0,0 +1,38 @@
+# /etc/inittab
+#
+# Copyright (C) 2001 Erik Andersen <andersen@codepoet.org>
+#
+# Note: BusyBox init doesn't support runlevels.  The runlevels field is
+# completely ignored by BusyBox init. If you want runlevels, use
+# sysvinit.
+#
+# Format for each entry: <id>:<runlevels>:<action>:<process>
+#
+# id        == tty to run on, or empty for /dev/console
+# runlevels == ignored
+# action    == one of sysinit, respawn, askfirst, wait, and once
+# 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
+# now run any rc scripts
+::sysinit:/etc/init.d/rcS
+
+# /sbin/getty invocation for tty0
+tty0::respawn:/sbin/getty 115200 tty0
+
+# Put a getty on the serial port
+console::respawn:/sbin/getty -L console 0 vt100
+
+# Stuff to do for the 3-finger salute
+::ctrlaltdel:/sbin/reboot
+
+# Stuff to do before rebooting
+::shutdown:/etc/init.d/rcK
+::shutdown:/sbin/swapoff -a
+::shutdown:/bin/umount -a -r
--- a/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch
+++ b/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
+
--- a/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch
+++ b/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
+
--- a/board/synopsys/axs10x/post-build.sh
+++ b/board/synopsys/axs10x/post-build.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-
-# Add a console on tty0
-if [ -e ${TARGET_DIR}/etc/inittab ]; then
-    grep -qE '^tty0::' ${TARGET_DIR}/etc/inittab || \
-	sed -i '/GENERIC_SERIAL/a\
-tty0::respawn:/sbin/getty 115200  tty0' ${TARGET_DIR}/etc/inittab
-fi
--- a/Show More
+++ b/Show More