Update for 2017.11.2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/xen: Force disable SDL for xen-qemu build
2026-01-11 14:10:13 +03:00 · 2018-01-21 22:08:22 +01:00 · 2018-01-21 21:19:55 +01:00 · 2018-01-21 21:18:25 +01:00 · 2018-01-21 21:17:41 +01:00 · 2018-01-21 21:17:28 +01:00
2391 changed files with 23312 additions and 36519 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 # It needs to be regenerated every time a defconfig is added, using
 # "make .gitlab-ci.yml".

-image: buildroot/base:20180318.1724
+image: buildroot/base

 .defconfig_script: &defconfig_script
    - echo 'Configure Buildroot'
@@ -30,10 +30,6 @@ check-DEVELOPERS:
    script:
        - "! utils/get-developers | grep -v 'No action specified'"

-check-package:
-    script:
-        - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} +
-
 .defconfig: &defconfig
    # Running the defconfigs for every push is too much, so limit to
    # explicit triggers through the API.
@@ -51,11 +47,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
@@ -66,7 +57,6 @@ check-package:
        expire_in: 2 weeks
        paths:
            - test-output/*.log
-            - test-output/*/.config
            - test-output/*/images/*
 acmesystems_aria_g25_128mb_defconfig: *defconfig
 acmesystems_aria_g25_256mb_defconfig: *defconfig
@@ -100,13 +90,13 @@ atmel_sama5d4_xplained_mmc_defconfig: *defconfig
 atmel_sama5d4_xplained_mmc_dev_defconfig: *defconfig
 bananapi_m1_defconfig: *defconfig
 bananapi_m2_plus_defconfig: *defconfig
-bananapi_m64_defconfig: *defconfig
 bananapro_defconfig: *defconfig
 beagleboardx15_defconfig: *defconfig
 beaglebone_defconfig: *defconfig
 beaglebone_qt5_defconfig: *defconfig
 chromebook_snow_defconfig: *defconfig
 ci20_defconfig: *defconfig
+ci40_defconfig: *defconfig
 csky_gx6605s_defconfig: *defconfig
 cubieboard2_defconfig: *defconfig
 engicam_imx6qdl_icore_defconfig: *defconfig
@@ -114,15 +104,20 @@ engicam_imx6qdl_icore_qt5_defconfig: *defconfig
 engicam_imx6qdl_icore_rqs_defconfig: *defconfig
 engicam_imx6ul_geam_defconfig: *defconfig
 engicam_imx6ul_isiot_defconfig: *defconfig
+firefly_rk3288_defconfig: *defconfig
+firefly_rk3288_demo_defconfig: *defconfig
 freescale_imx28evk_defconfig: *defconfig
+freescale_imx31_3stack_defconfig: *defconfig
 freescale_imx6dlsabreauto_defconfig: *defconfig
 freescale_imx6dlsabresd_defconfig: *defconfig
 freescale_imx6qsabreauto_defconfig: *defconfig
 freescale_imx6qsabresd_defconfig: *defconfig
+freescale_imx6sololiteevk_defconfig: *defconfig
 freescale_imx6sxsabresd_defconfig: *defconfig
+freescale_imx6ulevk_defconfig: *defconfig
 freescale_imx7dsabresd_defconfig: *defconfig
-friendlyarm_nanopi_a64_defconfig: *defconfig
-friendlyarm_nanopi_neo2_defconfig: *defconfig
+freescale_mpc8315erdb_defconfig: *defconfig
+freescale_p1010rdb_pa_defconfig: *defconfig
 galileo_defconfig: *defconfig
 gdb_bfin_bf512_defconfig: *defconfig
 grinn_chiliboard_defconfig: *defconfig
@@ -131,9 +126,6 @@ imx23evk_defconfig: *defconfig
 imx6-sabreauto_defconfig: *defconfig
 imx6-sabresd_defconfig: *defconfig
 imx6-sabresd_qt5_defconfig: *defconfig
-imx6slevk_defconfig: *defconfig
-imx6sx-sdb_defconfig: *defconfig
-imx6ulevk_defconfig: *defconfig
 imx6ulpico_defconfig: *defconfig
 imx7dpico_defconfig: *defconfig
 lego_ev3_defconfig: *defconfig
@@ -159,24 +151,15 @@ olimex_a20_olinuxino_lime2_defconfig: *defconfig
 olimex_a20_olinuxino_lime_defconfig: *defconfig
 olimex_a20_olinuxino_lime_mali_defconfig: *defconfig
 olimex_a20_olinuxino_micro_defconfig: *defconfig
-olimex_a64_olinuxino_defconfig: *defconfig
 olimex_imx233_olinuxino_defconfig: *defconfig
 openblocks_a6_defconfig: *defconfig
-orangepi_lite_defconfig: *defconfig
 orangepi_one_defconfig: *defconfig
-orangepi_pc2_defconfig: *defconfig
 orangepi_pc_defconfig: *defconfig
-orangepi_pc_plus_defconfig: *defconfig
 orangepi_plus_defconfig: *defconfig
-orangepi_prime_defconfig: *defconfig
-orangepi_win_defconfig: *defconfig
 orangepi_zero_defconfig: *defconfig
-orangepi_zero_plus2_defconfig: *defconfig
 pandaboard_defconfig: *defconfig
 pc_x86_64_bios_defconfig: *defconfig
 pc_x86_64_efi_defconfig: *defconfig
-pine64_defconfig: *defconfig
-pine64_sopine_defconfig: *defconfig
 qemu_aarch64_virt_defconfig: *defconfig
 qemu_arm_versatile_defconfig: *defconfig
 qemu_arm_versatile_nommu_defconfig: *defconfig
@@ -214,6 +197,7 @@ raspberrypi3_64_defconfig: *defconfig
 raspberrypi3_defconfig: *defconfig
 raspberrypi3_qt5we_defconfig: *defconfig
 raspberrypi_defconfig: *defconfig
+riotboard_defconfig: *defconfig
 roseapplepi_defconfig: *defconfig
 s6lx9_microboard_defconfig: *defconfig
 sheevaplug_defconfig: *defconfig
@@ -223,14 +207,13 @@ snps_archs38_axs103_defconfig: *defconfig
 snps_archs38_haps_defconfig: *defconfig
 snps_archs38_vdk_defconfig: *defconfig
 socrates_cyclone5_defconfig: *defconfig
-solidrun_macchiatobin_mainline_defconfig: *defconfig
-solidrun_macchiatobin_marvell_defconfig: *defconfig
 stm32f429_disco_defconfig: *defconfig
 stm32f469_disco_defconfig: *defconfig
+telit_evk_pro3_defconfig: *defconfig
 toradex_apalis_imx6_defconfig: *defconfig
 ts4800_defconfig: *defconfig
 ts4900_defconfig: *defconfig
-ts5500_defconfig: *defconfig
+ts5x00_defconfig: *defconfig
 ts7680_defconfig: *defconfig
 wandboard_defconfig: *defconfig
 warp7_defconfig: *defconfig
@@ -239,10 +222,6 @@ zynq_microzed_defconfig: *defconfig
 zynq_zc706_defconfig: *defconfig
 zynq_zed_defconfig: *defconfig
 zynq_zybo_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
@@ -253,10 +232,8 @@ tests.fs.test_ext.TestExt2r1: *runtime_test
 tests.fs.test_ext.TestExt3: *runtime_test
 tests.fs.test_ext.TestExt4: *runtime_test
 tests.fs.test_iso9660.TestIso9660Grub2External: *runtime_test
-tests.fs.test_iso9660.TestIso9660Grub2ExternalCompress: *runtime_test
 tests.fs.test_iso9660.TestIso9660Grub2Internal: *runtime_test
 tests.fs.test_iso9660.TestIso9660SyslinuxExternal: *runtime_test
-tests.fs.test_iso9660.TestIso9660SyslinuxExternalCompress: *runtime_test
 tests.fs.test_iso9660.TestIso9660SyslinuxInternal: *runtime_test
 tests.fs.test_jffs2.TestJffs2: *runtime_test
 tests.fs.test_squashfs.TestSquashfs: *runtime_test
@@ -278,8 +255,6 @@ tests.package.test_ipython.TestIPythonPy2: *runtime_test
 tests.package.test_ipython.TestIPythonPy3: *runtime_test
 tests.package.test_python.TestPython2: *runtime_test
 tests.package.test_python.TestPython3: *runtime_test
-tests.package.test_rust.TestRust: *runtime_test
-tests.package.test_rust.TestRustBin: *runtime_test
 tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test
 tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test
 tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -4,7 +4,7 @@
 # It needs to be regenerated every time a defconfig is added, using
 # "make .gitlab-ci.yml".

-image: buildroot/base:20180318.1724
+image: buildroot/base

 .defconfig_script: &defconfig_script
    - echo 'Configure Buildroot'
@@ -30,10 +30,6 @@ check-DEVELOPERS:
    script:
        - "! utils/get-developers | grep -v 'No action specified'"

-check-package:
-    script:
-        - find . -type f \( -name '*.mk' -o -name '*.hash' \) -exec ./utils/check-package {} +
-
 .defconfig: &defconfig
    # Running the defconfigs for every push is too much, so limit to
    # explicit triggers through the API.
@@ -51,11 +47,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
@@ -66,5 +57,4 @@ check-package:
        expire_in: 2 weeks
        paths:
            - test-output/*.log
-            - test-output/*/.config
            - test-output/*/images/*
--- a/560
+++ b/560
@@ -1,518 +1,3 @@
-2018.02.12, Released March 29th, 2019
-
-	Important / security related fixes.
-
-	Updated/fixed packages: avahi, beecrypt, busybox, clamav,
-	cups, devmem2, fetchmail, file, fltk, gcc, gdb, git, jq,
-	leveldb, libopenssl, libraw, libseccomp, libssh2,
-	libunistring, mariadb, mosquitto, nodejs, ntp, openjpeg, perl,
-	php, putty, qt5webkit, rdesktop, systemd, wireshark, vsftpd,
-	xapp_xdm, xlib_libXdmcp
-
-2018.02.11, Released February 23th, 2019
-
-	Important / security related fixes.
-
-	Ensure the PLATFORM and OS environment variables are not set,
-	as they cause build issues for some packages.
-
-	The package list infrastructure now correctly handles packages
-	installing files with old mtime.
-
-	Linux: Skip hash checks for user supplied downloadable
-	patches, as no hash checksums are available for those.
-
-	scanpypi: protect against zip-slip vulnerability in zip/tar
-	handling
-
-	Updated/fixed packages: bind, dhcpcd, dovecot, ghostscript,
-	gnuradio, imagemagick, jpeg-turbo, libarchive, libb64,
-	libcurl, libid3tag, madplay, mosquitto, openssh, php,
-	postgresql, proftpd, python, python-django, python3, qt5base,
-	sqlcipher, swupdate, systemd, unzip, webkitgtk
-
-2018.02.10, Released January 31th, 2019
-
-	Important / security related fixes.
-
-	Defconfigs: Fixes for Lego EV3, QEMU AArch64-virt
-
-	check-package: fix Python 3 support
-
-	get-developers: Fix behaviour when called from elsewhere than
-	the toplevel directory.
-
-	cmake: Also set CMAKE_SYSTEM_VERSION in toolchainfile.cmake
-
-	Updated/fixed packages: acpica, apache, apr, asterisk,
-	avrdude, cargo, cc-tool, dash, dhcpdump, dmalloc, gnuchess,
-	gnupg2, leveldb, libarchive, libassuan, libftdi1,
-	libgpg-error, libhttpparser, libmad, libsndfile, libsquish,
-	liburiparser, libwebsock, libxml2, lighttpd, lm-sensors,
-	lua-msgpack-native, mbedtls, mosquitto, netatalk, nodejs,
-	openssh, pango, patchelf, php, python-django, python-pyyaml,
-	rauc, rp-pppoe, s6-networking, samba4, sdl_sound,
-	shairport-sync, sqlite, subversion, sunxi-cedarx, tcpreplay,
-	tekui, usb_modeswitch, webkitgtk, wireshark, wolfssl,
-	xapp_rgb, xenomai, xerces
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11576: Unable to start apache with event MPM on raspberry pi 3
-
-2018.02.9, Released December 20th, 2018
-
-	Important / security related fixes.
-
-	defconfigs: Fixes for ci20
-
-	Updated/fixed packages: c-ares, dante, freetype, ghostscript,
-	glibc, gnutls, go, libcurl, libgpgme, libid3tag, libiscsi,
-	libmpd, libopenssl, libpjsip, linux, liquid-dsp, luvi, lynx,
-	msgpack, nginx, nodejs, php, popt, pps-tools, python-numpy,
-	python-requests, samba4, sdl2_net, squashfs, swupdate, uclibc,
-	wine, webkitgtk, xfsprogs
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11426: pps-tools bash dependency
-
-2018.02.8, 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.
-
-	graph-depends: Fix for package names starting with a non-alpha
-	character.
-
-	Updated/fixed packages: attr, audit, bind, brotli, easydbus,
-	elfutils, gauche, gcc, giflib, gpsd, lcdproc, libcurl,
-	libiscsi, libnfs, libnspr, libnss, libkcapi, libsemanage,
-	liburiparser, lighttpd, linux, lua-curl, mariadb, mmc-utils,
-	mosquitto, mysql, 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, xdriver_xf86-video-geode,
-	xlib_libfontenc, xproto_inputproto, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11086: download/git submodule breaks on symlinked dl folder
-	#11251: Util scanpypi failes when package change - to _ in..
-	#11476: stdio2.h error invalid use of __builtin_va_arg_pack
-	#11481: Docs: Is external.desc required?
-
-2018.02.7, Released October 25th, 2018
-
-	Important / security related fixes.
-
-	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, erlang, libarchive, libcurl, libssh, live555,
-	ljlinenoise, file, freetype, gcc, git, gvfs, leveldb, mariadb,
-	mongoose, netsnmp, nmap, nodejs, ntp, open-plc-utils, poco,
-	psmisc, qptpd2, python-enum34, qemu, qt, qt5base, spice,
-	spice-protocols, setools, tinc, ustr, wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11396: uboot environment image checksum invalid if target is big endian
-
-2018.02.6, Released October 7th, 2018
-
-	Important / security related fixes.
-
-	Add a number of patches to fix build errors for host utilities
-	on modern distributions using glibc-2.28.
-
-	mkusers: Ensure existing group members are preserved when a
-	group is reprocessed.
-
-	printvars: Fix issue with exceeding shell command line length
-	limits for certain setups.
-
-	Updated/fixes packages: acpid, android-tools, apache,
-	arp-scan, bandwidthd, bind, bison, clamav, connman, cppcms,
-	cramfs, fio, gcc, ghostscript, glibc, gnupg, httping,
-	igmpproxy, imagemagick, imlib2, ipsec-tools, lcms2, libcurl,
-	libesmtp, libnfs, libssh, libxslt, links, linuxptp,
-	mediastreamer, minicom, moarvm, nilfs-utils, ocrad, parted,
-	php, pv, python-django, qt, qt5quickcontrols, qt5webengine,
-	screen, sdl2, shairport-sync, squashfs, strongswan,
-	vboot-utils, webkitgtk, wireguard, x265, xen, xlib_libXfont,
-	xlib_libXft
-
-	New packages: brotli, woff2
-
-2018.02.5, Released August 29th, 2018
-
-	Important / security related fixes.
-
-	Defconfigs: Raspberrypi2: Bump rootfs size, T7680: Fix
-	genimage.cfg issue, ARM Juno: Bump ATF to v1.3 to fix build
-	issue.
-
-	Updated/fixed packages: acl, apache, attr, bind,
-	boot-wrapper-aarch64, brltty, bzip2, chrony, crda, cryptsetup,
-	dahdi-tools, dmidecode, dropbear, eigen, erlang, ffmpeg, gawk,
-	gcc, ghostscript, gnutls, ipsec-tools, libarchive, libfuse,
-	libopenssl, libselinux, libsoup, lighttpd, linuxptp,
-	lttng-modules, lttng-tools, lua-flu, lvm2, m4, makedevs,
-	mariadb, mbedtls, mesa3d-headers, mtd, ncurses, nodejs,
-	openssh, php, postgresql, python-django, qt5xmlpatterns, ruby,
-	samba4, shairport-sync, stress-ng, ti-utils, uboot-tools, vim,
-	waylandpp, wireless_tools, wireshark, wpa_supplicant, xorriso,
-	znc
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10781: cryptsetup luksOpen container_file container causes..
-	#10986: Installing package attr when already supplied by..
-	#11191: xattr and check-package issue
-
-2018.02.4, Released July 21th, 2018
-
-	Important / security related fixes.
-
-	U-Boot: Ensure host version of ncurses is picked up and not
-	host-ncurses built by buildroot, as that otherwise causes
-	widechar/non-widechar conflicts and corrupted menuconfig
-	menus.
-
-	Linux: Enable CONFIG_PERF_EVENTS when perf is enabled.
-
-	Defconfigs: Raspberrypi3: Bump rootfs size, Minnowboard-max:
-	Support ethernet on Turbot variant.
-
-	Updated/fixed packages: bind, clamav, collectd, dos2unix,
-	edid-decode, gcc, gdb, heimdal, hidapi, imx-gpu-viv, libcurl,
-	libglib2, liblogging, libostree, libsoup, libv4l, lm-sensors,
-	ncurses, network-manager, patchelf, pinentry, procps-ng, qpdf,
-	qt5, qt53d, qt5base, qt5charts, qt5script, qt5serialport,
-	systemd, wireguard, wireless-regdb
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11101: host-patchelf Endian Issue with relative RPATH
-
-2018.02.3, Released June 18th, 2018
-
-	Important / security related fixes.
-
-	Various fixes for building on modern distributions (GCC 8.x,
-	no rpcgen utility).
-
-	ARM: Default to binutils 2.28 and warn about newer binutils
-	versions, which are known to cause boot failures for Linux
-	kernels built in thumb mode.
-
-	Busybox/mdev: Fix module autoloading.
-
-	Busybox/sysvinit: inittab: Add /dev/{stdin,stdout,stderr}
-	symlinks, call swapon -a to activate any configured swap
-	devices.
-
-	Dependencies: Check that PATH does not contain current working
-	directory, which triggers a number of build failures.
-
-	Infrastructure: Error out for packages erroneously using the
-	'local' site method but not defining a _SITE.
-
-	Linux: Fix cuImage.<dtb> / simpleImage.<dtb> handling.  Ensure
-	kconfig uses ncurses from the host to fix a ncurses/ncursesw
-	mixup, causing menuconfig display corruption.
-
-	Toolchain: Workarounds for fix-rpath issues with binutils and
-	elf2flt.
-
-	Util-linux: Fix blocking on getrandom() issue with recent
-	kernels.
-
-	Remove broken freescale_imx31_3stack,
-	freescale_imx6sololiteevk and freescale_imx6ulevk defconfigs.
-
-	Updated/fixed packages: apr-util, asterisk, attr, audit,
-	autofs, binutils, busybox, cifs-utils, cups-filters, dash,
-	ebtables, exim, expect, f2fs-tools, faketime, file, gdb, git,
-	glibc, gnupg, gnupg2, gst1-plugins-bad, imagemagick, jamvm,
-	jpeg-turbo, libcap, libcoap, libcurl, libgcrypt, libjpeg,
-	libnss, libressl, libtirpc, libvncserver, libvorbis, libxslt,
-	log4cplus, lrzsz, ltrace, lynx, mariadb, mbedtls, mpg123,
-	nasm, netplug, network-manager, nfs-utils, nodejs,
-	openvmtools, patch, perl, php-amqp, poppler, procps-ng,
-	python, python-websockets, quota, redis, samba4, sysvinit,
-	transmission, triggerhappy, util-linux, wavpack, wget,
-	wireshark, xen, zmqpp
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10986: Installing package attr when already supplied by busybox..
-	#11031: ld-elf2flt: host/bin/ld.real': execvp: No such file or..
-
-2018.02.2, Released May 4th, 2018
-
-	Important / security related fixes.
-
-	Tweak package size/file instrumentation to better handle
-	package rebuilds.
-
-	Revert /etc/shells creation when bash is enabled.
-
-	Exclude /lib/firmware from the rpath fixup logic, as it may
-	contain non-native ELF files.
-
-	Scanpypi: Support the new PyPi infrastructure.
-
-	Handle GCC 8.x on the host.
-
-	Ensure timestamp of /usr is updated to support the systemd
-	ConditionNeedsUpdate option.
-
-	Updated/fixed packages: bluez5_utils, flann, gdb, gnupg2,
-	grub2, libcec, libcgi, libglib2, libgpg-error, libgpgme,
-	libtomcrypt, mbedtls, mkpasswd, php, python, python-requests,
-	python-watchdog, qt53d, qt5websockets, sdl2, sdl2_image,
-	syslog-ng, systemd, tcl, tcllib, uclibc, usb_modeswitch,
-	wireguard, wmctrl
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10896: /bin/sh not in /etc/shells
-	#10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled
-
-2018.02.1, Released April 9th, 2018
-
-	Important / security related fixes.
-
-	Removed unmaintained defconfigs: Creator Ci40, Firefly rk3288,
-	Freescale mpc8315erdb / p1010rdb_pa, Riotboard, Teliv EVK
-	Pro3.
-
-	Infrastructure: Speed up instrumentation for package size by
-	comparing timestamps instead of md5 checksums, as doing
-	checksums could lead to up to 25% longer build time for big
-	configurations.
-
-	Rename the internal <pkg>_BASE_NAME variable to <pkg>_NASENAME
-	to avoid name clashes with packages ending on '-base'.
-
-	Add a better fix for build issues for autotools based packages
-	checking for C++ support on toolchains without C++ support.
-
-	Build host-tar if tar is older than 1.27 on the build machine
-	to work around reproducibility issues with git archives
-	containing long paths.
-
-	check-unique-files: Fix for filenames not representable in the
-	users' locale.
-
-	Check-bin-arch: Add support for per-package ignore paths
-	(<pkg>_BIN_ARCH_EXCLUDE).
-
-	Toolchain: Fix SSP support detection for external toolchains.
-
-	linux: Add _NEEDS_HOST_OPENSSL / LIBELF options to ensure
-	these dependencies are available for Linux configurations
-	needed these dependencies, similar to how it is done for
-	U-Boot.
-
-	Support custom (not in tree) device tree files in addition to
-	in-tree ones.
-
-	U-Boot / uboot-tools: Fix header conflict with libfdt-devel
-	installed on host.
-
-	Updated/fixed packages: apache, busybox, c-ares, cmake,
-	docker-engine, enlightenment, eudev, fbgrab, freescale-imx,
-	gtest, imagemagick, intel-microcode, irssi, jimtcl, kmod,
-	kodi, ktap, libcoap, libcurl, libfcgi, libhttpparser,
-	libminiupnpc, libopenssl, libpjsip, libss7, libssh2, libupnp
-	libupnpp, libuv, libvorbis, memcached, motion, musl, nodejs,
-	ntp, openblas, opencv3, openocd, opus-tools, patch, php,
-	pkgconf, postgresql, powerpc-utils, python-jsonschema,
-	python-webpy, qemu, qt5bsae, qt5script, qt5webkit, rapidjson,
-	rauc, sam-ba, samba4, sngrep, systemd, tremor, uboot-tools,
-	uclibc-ng-test, upmpdcli, wireshark, xerces, xterm, zstd
-
-	New packages: docker-proxy, python-functools32
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10766: upmpdcli: Segmentation fault
-	#10776: ktap fails to build
-	#10846: error in compiling gnutls
-	#10856: openblas on qemu_x86_64_defconfig fails with "sgemm_..
-
-2018.02, Released March 4th, 2018
-
-	Fixes all over the tree.
-
-	Issues with systemd with a readonly rootfs and DBus fixed.
-
-	Instructure:
-	- check-uniq-files: fix Python 2.6 compatibility.
-	- dependencies.sh: check for external argparse module for
-	  Python 2.6.
-	- Add infrastructure to detect and use a UTF-8 locale on the
-	  host, needed by systemd.
-
-	Update/fixed packages: clamav, dash, dhcp, dovecot, efl,
-	ffmpeg, libv4l, mono, mosquitto, php, postgresql, qt,
-	scanpypi, sdl2, systemd, tor, tvheadend, uboot, wavpack
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10831: qemu_x86_64_defconfig build fails on linux-headers..
-
-2018.02-rc3, Released February 27th, 2018
-
-	Fixes all over the tree.
-
-	check-bin-arch: skip /lib/modules to allow 32-bit userland
-	with 64bit kernel.
-
-	dependencies: Blacklist tar 1.30+ and build our own host-tar
-	if needed as tar 1.30+ changed the --numeric-owner output for
-	long path names. Build host-tar before other host-dependencies
-	as they need it to extract their source tarballs.
-
-	Update/fixed packages: asterisk, azmq, bluez5_utils, domoticz,
-	e2fsprogs, erlang, exim, glibc, gpsd, jq, libglib2, libvorbis,
-	mariadb, mbedtls, mesa3d, mesa3d-headers, mpv, patch, pcre2,
-	php, qt5, qt5multimedia, qt5wayland, qt5webengine, qt5webkit,
-	systemd, quagga, rustc, uboot, wireguard, zic, zlib-ng
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10726: Current libglib2.mk creates broken libglib2 binary...
-	#10786: Linux fails to build unless make linux-menuconfig...
-	#10796: Cannot generate cpio image without selecting CON...
-
-2018.02-rc2, Released February 15th, 2018
-
-	Fixes all over the tree.
-
-	Dependencies: Ensure C++ support is available like for C
-	support for packages needing 32bit host support.
-
-	utils/genrandconfig: Check host dependencies for config.
-
-	Updated/fixed packages: busybox, dnsmasq, dropbear, ffmpeg,
-	glibc, keepalived, libcpprestsdk, libgpiod, libmaxminddb,
-	librsvg, libtasn1, libv4l, libxml2, lightning, ltp-testsuite,
-	mesa3d, mesa3d-demos, mesa3d-headers, nftables, open-lldp,
-	php, postgresql, python-crossbar, qt5, qt53d, qt5enginio,
-	qt5tools, qt5webengine, qt5webkit, rsync, rust-bin, rustc,
-	systemd
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#9781: ti-sgx-km build on kernel >4.1
-	#10141: Squashfs extended attribute failures
-
-2018.02-rc1, Released February 5th, 2018
-
-	The global source-check and per-package <pkg>-source-check
-	targets have been removed.
-
-	Architecture: Add x86 Silvermont variant. Add several new ARM
-	variants, rework MIPS NaN logic. Support mainline binutils/gcc
-	for ARC.
-
-	Toolchains: Linaro toolchains upgraded to 2017.11 release, ARC
-	external toolchains upgraded to arc-2017.09. Libatomic is now
-	also copied for external musl based toolchains.
-	Add binutils 2.30.x and switch to binutils 2.29.x by default.
-
-	Added hardening options to build with RELRO and FORTITY.
-
-	New defconfigs: Bananapi M64, FriendlyARM Nanopi A64 & NEO2,
-	imx6slevk, imx6sx-sdb, imx6ulevk, Olimex A64-OLinuXino,
-	Orangepi lite / pc plus / pc / prime / win / win plus / zero
-	plus2, Pine64, Solidrun MacchiatoBin. Sopine.
-
-	Add utils/diffconfig, a simple utility for comparing
-	configuration files - Adapted from the version in the
-	Linux kernel.
-
-	Infrastructure: Check that the same file is not touched by
-	multiple packages, as a preparation for toplevel parallel
-	builds.
-
-	Hashes for the license files for a large number of packages
-	have been added, ensuring that license changes will not be
-	missed when packages are bumped.
-
-	Fix build issue for autotools based packages checking for C++
-	support on toolchains without C++ support and on a distro
-	lacking /lib/cpp (E.G. Arch Linux).
-
-	Support for the meson build system.
-
-	Pie charts generated by 'graph-build' or 'graph-size' are now
-	sorted according to the size of each piece.
-
-	System: Only show getty options when busybox init or sysvinit
-	are used.
-
-	ARM-trusted-firmware: Support ATF bundled in U-Boot as
-	well as U-Boot bundled in ATF.
-
-	Zlib is now a virtual package, provided by either libzlib or
-	zlib-ng, similar to openssl.
-
-	Support for the Rust programming language.
-
-	New packages: aoetools, armbian-firmware, binaries-marvell,
-	brltty, cargo, cargo-bin, cups-filters, curlpp, daq,
-	flatbuffers, gconf, glorytun, gstreamer1-mm, imx-m4fwloader,
-	imx-gpu-g2d, json-for-modern-cpp, libcpprestsdk, libgta,
-	libostree, libupnp18, luadbi, luadbi-sqlite3, lua-utf8, lynx,
-	meson, mv-ddr-marvell, nilfs-utils, opentracing-cpp,
-	open-lldp, pimd, proj, python-flask-cors,
-	python-jaraco-classes, python-more-itertools, python-oauthlib,
-	python-raven, python-remi, python-requests-oauthlib,
-	python-schedule, python-secretstorage, python-see,
-	python-tabledata, python-txtorcon, python-xlib, qt5charts,
-	rtl8189fs, rtl8723bu, rust, rustc, rust-bin, rygel, safeclib,
-	solatus, tcf-agent, traceroute, waylandpp, wolfssl,
-	zisofs-tools, zlib-ng
-
-	Removed packages: eeprog
-
 2017.11.2, Released January 21st, 2018

 	Important / security related fixes.
@@ -1222,51 +707,6 @@
 	#9846: musl libc not installed correctly in target folder
 	#9856: build libubox failed on ubuntu 17.04 64bit

-2017.02.10, Released January 31st, 2018
-
-	Important / security related fixes.
-
-	nconfig: Fix for ncurses/ncursesw linking issue causing crashes.
-
-	System: Only show getty options when busybox init or sysvinit
-	are used.
-
-	Infrastructure: Fix build issue for autotools based packages
-	checking for C++ support on toolchains without C++ support and
-	on a distro lacking /lib/cpp (E.G. Arch Linux).
-
-	Updated/fixed packages: avahi, berkeleydb, bind, busybox,
-	ccache, clamav, coreutils, dovecot, eeprog, eudev, fis,
-	intel-microcode, iputils, irssi, kmsxx, libcurl, liberation,
-	libiio, lz4, mariadb, matchbox-lib, mcookie, openocd, php,
-	pound, rpcbind, squid, tar, ti-cgt-pru, transmission,
-	util-linux, webkitgtk, wireshark, xen
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#9996: lz4 package does not install lz4 binaries in target
-	#10176: Rsyslog's S01logging is deleted by Busybox.mk from...
-	#10216: package/x11r7/mcookie/mcookie.c:207: bad size ?
-	#10301: systemd/getty unused options
-	#10331: kmsxx, host installation fails with BR2_SHARED_...
-	#10536: Finding non-relative paths in the ccache
-	#10641: avahi-autoipd not starting when using systemd-tmpfiles
-
-2017.02.9, Released January 1st, 2018
-
-	Important / security related fixes.
-
-	Fix divide by zero issue in size-stats script.
-
-	Fix makefile include ordering issue with certain make versions
-	in the external toolchain handling.
-
-	Updated/fixed packages: dhcp, exim, flann, gdb, heimdal,
-	libcue, libcurl, libevent, libpqxx, libsoxr, linphone, lldpd,
-	mariadb, mfgtools, mtools, nodejs, nut, openssl, rsync,
-	samba4, tor, vlc, webkitgtk, wireshark, xfsprogs,
-	xlib_libXcursor, xlib_libXfont, xlib_libXfont2
-
 2017.02.8, Released November 27th, 2017

 	Important / security related fixes.
--- a/Config.in
+++ b/Config.in
@@ -62,14 +62,6 @@ config BR2_HOST_GCC_AT_LEAST_7
 	default y if BR2_HOST_GCC_VERSION = "7"
 	select BR2_HOST_GCC_AT_LEAST_6

-config BR2_HOST_GCC_AT_LEAST_8
-	bool
-	default y if BR2_HOST_GCC_VERSION = "8"
-	select BR2_HOST_GCC_AT_LEAST_7
-
-# 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
@@ -340,9 +332,6 @@ config BR2_CCACHE_DIR
 	default "$(HOME)/.buildroot-ccache"
 	help
 	  Where ccache should store cached files.
-	  If the Linux shell environment has defined the BR2_CCACHE_DIR
-	  environment variable, then this overrides this configuration
-	  item.

 config BR2_CCACHE_INITIAL_SETUP
 	string "Compiler cache initial setup"
@@ -578,6 +567,61 @@ config BR2_GOOGLE_BREAKPAD_INCLUDE_FILES

 endif

+choice
+	bool "build code with Stack Smashing Protection"
+	default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy
+	depends on BR2_TOOLCHAIN_HAS_SSP
+	help
+	  Enable stack smashing protection support using GCC's
+	  -fstack-protector option family.
+
+	  See
+	  http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
+	  for details.
+
+	  Note that this requires the toolchain to have SSP support.
+	  This is always the case for glibc and eglibc toolchain, but is
+	  optional in uClibc toolchains.
+
+config BR2_SSP_NONE
+	bool "None"
+	help
+	  Disable stack-smashing protection.
+
+config BR2_SSP_REGULAR
+	bool "-fstack-protector"
+	help
+	  Emit extra code to check for buffer overflows, such as stack
+	  smashing attacks. This is done by adding a guard variable to
+	  functions with vulnerable objects. This includes functions
+	  that call alloca, and functions with buffers larger than 8
+	  bytes. The guards are initialized when a function is entered
+	  and then checked when the function exits. If a guard check
+	  fails, an error message is printed and the program exits.
+
+config BR2_SSP_STRONG
+	bool "-fstack-protector-strong"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	help
+	  Like -fstack-protector but includes additional functions to be
+	  protected - those that have local array definitions, or have
+	  references to local frame addresses.
+
+comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_SSP_ALL
+	bool "-fstack-protector-all"
+	help
+	  Like -fstack-protector except that all functions are
+	  protected. This option might have a significant performance
+	  impact on the compiled binaries.
+
+endchoice
+
+comment "Stack Smashing Protection needs a toolchain w/ SSP"
+	depends on !BR2_TOOLCHAIN_HAS_SSP
+
 choice
 	bool "libraries"
 	default BR2_SHARED_LIBS if BR2_BINFMT_SUPPORTS_SHARED
@@ -688,137 +732,6 @@ config BR2_REPRODUCIBLE

 endmenu

-comment "Security Hardening Options"
-
-choice
-	bool "Stack Smashing Protection"
-	default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy
-	depends on BR2_TOOLCHAIN_HAS_SSP
-	help
-	  Enable stack smashing protection support using GCC's
-	  -fstack-protector option family.
-
-	  See
-	  http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
-	  for details.
-
-	  Note that this requires the toolchain to have SSP support.
-	  This is always the case for glibc and eglibc toolchain, but is
-	  optional in uClibc toolchains.
-
-config BR2_SSP_NONE
-	bool "None"
-	help
-	  Disable stack-smashing protection.
-
-config BR2_SSP_REGULAR
-	bool "-fstack-protector"
-	help
-	  Emit extra code to check for buffer overflows, such as stack
-	  smashing attacks. This is done by adding a guard variable to
-	  functions with vulnerable objects. This includes functions
-	  that call alloca, and functions with buffers larger than 8
-	  bytes. The guards are initialized when a function is entered
-	  and then checked when the function exits. If a guard check
-	  fails, an error message is printed and the program exits.
-
-config BR2_SSP_STRONG
-	bool "-fstack-protector-strong"
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-	help
-	  Like -fstack-protector but includes additional functions to be
-	  protected - those that have local array definitions, or have
-	  references to local frame addresses.
-
-comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9"
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-
-config BR2_SSP_ALL
-	bool "-fstack-protector-all"
-	help
-	  Like -fstack-protector except that all functions are
-	  protected. This option might have a significant performance
-	  impact on the compiled binaries.
-
-endchoice
-
-comment "Stack Smashing Protection needs a toolchain w/ SSP"
-	depends on !BR2_TOOLCHAIN_HAS_SSP
-
-choice
-	bool "RELRO Protection"
-	depends on BR2_SHARED_LIBS
-	help
-	  Enable a link-time protection know as RELRO (RELocation Read Only)
-	  which helps to protect from certain type of exploitation techniques
-	  altering the content of some ELF sections.
-
-config BR2_RELRO_NONE
-	bool "None"
-	help
-	  Disables Relocation link-time protections.
-
-config BR2_RELRO_PARTIAL
-	bool "Partial"
-	help
-	  This option makes the dynamic section not writeable after
-	  initialization (with almost no performance penalty).
-
-config BR2_RELRO_FULL
-	bool "Full"
-	help
-	  This option includes the partial configuration, but also
-	  marks the GOT as read-only at the cost of initialization time
-	  during program loading, i.e every time an executable is started.
-
-endchoice
-
-comment "RELocation Read Only (RELRO) needs shared libraries"
-	depends on !BR2_SHARED_LIBS
-
-choice
-	bool "Buffer-overflow Detection (FORTIFY_SOURCE)"
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	depends on !BR2_OPTIMIZE_0
-	help
-	  Enable the _FORTIFY_SOURCE macro which introduces additional
-	  checks to detect buffer-overflows in the following standard library
-	  functions: memcpy, mempcpy, memmove, memset, strcpy, stpcpy,
-	  strncpy, strcat, strncat, sprintf, vsprintf, snprintf, vsnprintf,
-	  gets.
-
-	  NOTE: This feature requires an optimization level of s/1/2/3/g
-
-	  Support for this feature has been present since GCC 4.x.
-
-config BR2_FORTIFY_SOURCE_NONE
-	bool "None"
-	help
-	  Disables additional checks to detect buffer-overflows.
-
-config BR2_FORTIFY_SOURCE_1
-	bool "Conservative"
-	# 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
-	  programs.  Adds checks at compile-time only.
-
-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.
-	  Also adds checks at run-time (detected buffer overflow
-	  terminates the program)
-
-endchoice
-
-comment "Fortify Source needs a glibc toolchain and optimization"
-	depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0)
 endmenu

 source "toolchain/Config.in"
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -135,95 +135,13 @@ comment "legacy options in the menu below. Once you have     "
 comment "disabled all legacy options, this text will         "
 comment "disappear and you will be able to start the build.  "
 comment "*                                                   "
-comment "Note: legacy options older than 5 years have been   "
-comment "removed, and configuration files that still have    "
-comment "those options set, will fail to build, or run in    "
-comment "unpredictable ways.                                 "
+comment "Note: at some point in the future, the oldest legacy"
+comment "options will be removed, and configuration files    "
+comment "that still have those options set, will fail to     "
+comment "build, or run, in unpredictable ways.               "
 comment "----------------------------------------------------"
 endif

-###############################################################################
-comment "Legacy options removed in 2018.02"
-
-config BR2_PACKAGE_TRANSMISSION_REMOTE
-	bool "transmission remote tool option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_TRANSMISSION_DAEMON
-	help
-	  Upstream does not provide a separate configure option for
-	  the tool transmission-remote, it is built when the
-	  transmission daemon has been enabled. Therefore, Buildroot
-	  has automatically enabled BR2_PACKAGE_TRANSMISSION_DAEMON
-	  for you.
-
-config BR2_KERNEL_HEADERS_3_4
-	bool "kernel headers version 3.4.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
-	select BR2_LEGACY
-	help
-	  Version 3.4.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
-
-config BR2_KERNEL_HEADERS_3_10
-	bool "kernel headers version 3.10.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
-	select BR2_LEGACY
-	help
-	  Version 3.10.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
-
-config BR2_KERNEL_HEADERS_3_12
-	bool "kernel headers version 3.12.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
-	select BR2_LEGACY
-	help
-	  Version 3.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
-
-config BR2_BINUTILS_VERSION_2_27_X
-	bool "binutils version 2.27 support removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils version 2.27 has been removed. The
-	  current default version (2.29 or later) has been selected
-	  instead.
-
-config BR2_PACKAGE_EEPROG
-	bool "eeprog package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_I2C_TOOLS
-	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	help
-	  The eeprog program is now provided by the i2c-tools package.
-
-config BR2_PACKAGE_GNUPG2_GPGV2
-	bool "gnupg2 gpgv2 option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GNUPG2_GPGV
-	help
-	  The gpgv2 executable is now named gpgv. The config option
-	  has been renamed accordingly.
-
-config BR2_PACKAGE_IMX_GPU_VIV_APITRACE
-	bool "Vivante apitrace tool option removed"
-	select BR2_LEGACY
-	help
-	  The apitrace tool for Vivante is not provided by the
-	  imx-gpu-viv package any longer.
-
-config BR2_PACKAGE_IMX_GPU_VIV_G2D
-	bool "Vivante G2D libraries from imx-gpu-viv removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_IMX_GPU_G2D
-	help
-	  The G2D libraries are now provided by the imx-gpu-g2d package.
-
 ###############################################################################
 comment "Legacy options removed in 2017.11"

@@ -1225,6 +1143,13 @@ config BR2_x86_i386
 	  The support for the i386 processors of the x86 architecture
 	  has been removed.

+config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
+	bool "qt5webkit-examples package removed"
+	select BR2_LEGACY
+	help
+	  The qt5webkit-examples package has been removed, since it
+	  was removed from upstream starting from Qt 5.6.
+
 config BR2_PACKAGE_QT5QUICK1
 	bool "qt5quick1 package removed"
 	select BR2_LEGACY
@@ -1394,7 +1319,6 @@ config BR2_LINUX_KERNEL_SAME_AS_HEADERS

 config BR2_PACKAGE_CUPS_PDFTOPS
 	bool "Pdftops support has been removed from Cups"
-	select BR2_PACKAGE_CUPS_FILTERS
 	select BR2_LEGACY
 	help
 	  Pdftops support has been removed from the cups package
@@ -3135,6 +3059,144 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
 	help
 	  Now covers the whole Realtek 87xx familly: 8712/8723.

+###############################################################################
+comment "Legacy options removed in 2013.02"
+
+config BR2_sa110
+	bool "sa110 ARM target switched to strongarm"
+	select BR2_LEGACY
+	select BR2_strongarm
+	help
+	  The SA110 is the same as a generic StrongARM, it just differs
+	  in speed, peripherals and cache.
+
+config BR2_sa1100
+	bool "sa1100 ARM target switched to strongarm"
+	select BR2_LEGACY
+	select BR2_strongarm
+	help
+	  The SA1100 is the same as a generic StrongARM, it just differs
+	  in speed, peripherals and cache.
+
+config BR2_PACKAGE_GDISK
+	bool "gdisk has been replaced by gptfdisk"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GPTFDISK
+	help
+	  The option has been renamed BR2_PACKAGE_GPTFDISK.
+
+config BR2_PACKAGE_GDISK_GDISK
+	bool "gdisk tool from gdisk has been replaced by gdisk in gptfdisk"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GPTFDISK
+	select BR2_PACKAGE_GPTFDISK_GDISK
+	help
+	  The option has been renamed BR2_PACKAGE_GPTFDISK_GDISK.
+
+config BR2_PACKAGE_GDISK_SGDISK
+	bool "sgdisk tool from gdisk has been replaced by sgdisk in gptfdisk"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GPTFDISK
+	select BR2_PACKAGE_GPTFDISK_SGDISK
+	help
+	  The option has been renamed BR2_PACKAGE_GPTFDISK_SGDISK.
+
+config BR2_PACKAGE_GDB_HOST
+	bool "gdb for the host option has been renamed"
+	select BR2_PACKAGE_HOST_GDB
+	select BR2_LEGACY
+	help
+	  Due to the conversion of gdb to the package infrastructure,
+	  the BR2_PACKAGE_GDB_HOST option has been renamed
+	  BR2_PACKAGE_HOST_GDB.
+
+config BR2_PACKAGE_DIRECTB_DITHER_RGB16
+	bool "DirectFB RGB16 dithering option has been renamed"
+	select BR2_PACKAGE_DIRECTFB_DITHER_RGB16
+	select BR2_LEGACY
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_DIRECTFB_DITHER_RGB16.
+
+config BR2_PACKAGE_DIRECTB_TESTS
+	bool "DirectFB Tests option has been renamed"
+	select BR2_PACKAGE_DIRECTFB_TESTS
+	select BR2_LEGACY
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_DIRECTFB_TESTS.
+
+###############################################################################
+comment "Legacy options removed in 2012.11"
+
+config BR2_PACKAGE_CUSTOMIZE
+	bool "customize package has been removed"
+	select BR2_LEGACY
+	help
+	  The 'customize' special package has been removed. Instead,
+	  we recommend to create either your own packages, or use a
+	  post-build script to customize your root filesystem. See
+	  Buildroot's documentation for more details.
+
+config BR2_PACKAGE_XSERVER_xorg
+	bool "X.org modular server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
+
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "KDrive / TinyX server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
+
+config BR2_PACKAGE_PTHREAD_STUBS
+	bool "pthread-stubs option has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBPTHREAD_STUBS
+	help
+	  For consistency reason, the pthread-stubs package has been
+	  renamed to libpthread-stubs.
+
+###############################################################################
+comment "Legacy options removed in 2012.08"
+
+config BR2_PACKAGE_GETTEXT_STATIC
+	bool "libgettext.a is now selected by BR2_PREFER_STATIC_LIB"
+	select BR2_LEGACY
+	help
+	  To build a static gettext library, select BR2_PREFER_STATIC_LIB.
+
+
+config BR2_PACKAGE_LIBINTL
+	bool "libintl"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GETTEXT
+	help
+	  libintl is now installed by selecting BR2_PACKAGE_GETTEXT. This now
+	  only installs the library, not the executables.
+
+config BR2_PACKAGE_INPUT_TOOLS_EVTEST
+	bool "input-tools evtest is now a separate package evtest"
+	select BR2_LEGACY
+	select BR2_PACKAGE_EVTEST
+	help
+	  The evtest program from input-tools is now a separate package.
+
+config BR2_BFIN_FDPIC
+	bool "BR2_BFIN_FDPIC is now BR2_BINFMT_FDPIC"
+	select BR2_BINFMT_FDPIC
+	select BR2_LEGACY
+
+config BR2_BFIN_FLAT
+	bool "BR2_BFIN_FLAT is now BR2_BINFMT_FLAT"
+	select BR2_BINFMT_FLAT
+	select BR2_LEGACY
+
 endmenu

 endif # !SKIP_LEGACY
--- a/174
+++ b/174
@@ -35,7 +35,6 @@ F:	package/busybox/
 F:	package/checkpolicy/
 F:	package/cppdb/
 F:	package/gstreamer1/gstreamer1/
-F:	package/gstreamer1/gstreamer1-mm/
 F:	package/gstreamer1/gst1-plugins-bad/
 F:	package/gstreamer1/gst1-plugins-base/
 F:	package/gstreamer1/gst1-plugins-good/
@@ -43,8 +42,6 @@ F:	package/gstreamer1/gst1-plugins-ugly/
 F:	package/gstreamer1/gst1-vaapi/
 F:	package/imx-usb-loader/
 F:	package/janus-gateway/
-F:	package/json-for-modern-cpp/
-F:	package/libcpprestsdk/
 F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
@@ -60,13 +57,8 @@ F:	package/setools/
 F:	package/sngrep/

 N:	Adrian Perez de Castro <aperez@igalia.com>
-F:	package/brotli/
 F:	package/libepoxy/
 F:	package/webkitgtk/
-F:	package/woff2/
-
-N:	Adrien Gallouët <adrien@gallouet.fr>
-F:	package/glorytun/

 N:	Aleksander Morgado <aleksander@aleksander.es>
 F:	package/libmbim/
@@ -87,20 +79,17 @@ F:	package/putty/
 N:	Alexander Lukichev <alexander.lukichev@espotel.com>
 F:	package/openpgm/

-N:	Alexander Mukhin <alexander.i.mukhin@gmail.com>
-F:	package/hostapd/
-
 N:	Alexander Varnin <fenixk19@mail.ru>
 F:	package/liblog4c-localtime/

-N:	Alexandre Belloni <alexandre.belloni@bootlin.com>
+N:	Alexandre Belloni <alexandre.belloni@free-electrons.com>
 F:	package/tz/

 N:	Alexandre Esse <alexandre.esse.dev@gmail.com>
 F:	package/kvazaar/
 F:	package/v4l2loopback/

-N:	Alistair Francis <alistair@alistair23.me>
+N:	Alistair Francis <alistair.francis@xilinx.com>
 F:	package/xen/

 N:	Alvaro G. M <alvaro.gamez@hazent.com>
@@ -152,7 +141,7 @@ F:	package/lsscsi/
 N:	Anthony Viallard <viallard@syscom-instruments.com>
 F:	package/gnuplot/

-N:	Antoine Ténart <antoine.tenart@bootlin.com>
+N:	Antoine Ténart <antoine.tenart@free-electrons.com>
 F:	package/wf111/

 N:	ARC Maintainers <arc-buildroot@synopsys.com>
@@ -190,9 +179,6 @@ F:	package/luasec/
 F:	package/lua-ev/
 F:	package/orbit/

-N:	Bartosz Bilas <b.bilas@grinn-global.com>
-F:	package/qt5/qt5scxml/
-
 N:	Bartosz Golaszewski <brgl@bgdev.pl>
 F:	package/autoconf-archive/
 F:	package/doxygen/
@@ -338,13 +324,10 @@ F:	package/python-mwclient/
 F:	package/python-mwscrape/
 F:	package/python-mwscrape2slob/
 F:	package/python-mako/
-F:	package/python-oauthlib/
 F:	package/python-pyicu/
 F:	package/python-pylru/
-F:	package/python-requests-oauthlib/
 F:	package/python-slob/
 F:	package/rtmpdump/
-F:	package/samba4/
 F:	package/softether/
 F:	package/taglib/
 F:	package/tinyxml2/
@@ -356,7 +339,6 @@ F:	package/vdr/
 F:	package/vdr-plugin-vnsiserver/
 F:	package/vlc/
 F:	package/vnstat/
-F:	package/waylandpp/
 F:	package/x11r7/
 F:	package/x264/
 F:	package/x265/
@@ -421,7 +403,6 @@ F:	package/aufs-util/
 F:	package/batman-adv/
 F:	package/docker-containerd/
 F:	package/docker-engine/
-F:	package/docker-proxy/
 F:	package/mosh/
 F:	package/rtl8821au/
 F:	package/runc/
@@ -469,6 +450,7 @@ F:	package/log4cpp/

 N:	Daniel Nyström <daniel.nystrom@timeterminal.se>
 F:	package/e2tools/
+F:	package/fbgrab/

 N:	Daniel Price <daniel.price@gmail.com>
 F:	package/nodejs/
@@ -541,19 +523,13 @@ N:	Ed Swierk <eswierk@skyportsystems.com>
 F:	package/xxhash/

 N:	Eric Le Bihan <eric.le.bihan.dev@free.fr>
-F:	docs/manual/adding-packages-meson.txt
 F:	package/adwaita-icon-theme/
-F:	package/cargo-bin/
-F:	package/cargo/
 F:	package/darkhttpd/
 F:	package/eudev/
 F:	package/execline/
 F:	package/hicolor-icon-theme/
 F:	package/jemalloc/
-F:	package/meson/
 F:	package/ninja/
-F:	package/rust-bin/
-F:	package/rust/
 F:	package/s6/
 F:	package/s6-dns/
 F:	package/s6-linux-init/
@@ -589,8 +565,6 @@ N:	Evan Zelkowitz <evan.zelkowitz@gmail.com>
 F:	package/sdl_gfx/

 N:	Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-F:	board/ci20/
-F:	configs/ci20_defconfig
 F:	arch/Config.in.nios2
 F:	package/fio/
 F:	package/iptraf-ng/
@@ -604,16 +578,8 @@ F:	package/supertuxkart/
 N:	Fabio Estevam <festevam@gmail.com>
 F:	board/warp7/
 F:	configs/freescale_imx*
-F:	configs/imx23evk_defconfig
-F:	configs/imx6-sabre*
-F:	configs/imx6slevk_defconfig
-F:	configs/imx6sx-sdb_defconfig
-F:	configs/imx6ulevk_defconfig
+F:	configs/imx6-sabresd*
 F:	configs/imx6ulpico_defconfig
-F:	configs/imx7dpico_defconfig
-F:	configs/mx25pdk_defconfig
-F:	configs/mx51evk_defconfig
-F:	configs/mx53loco_defconfig
 F:	configs/mx6cubox_defconfig
 F:	configs/mx6sx_udoo_neo_defconfig
 F:	configs/mx6udoo_defconfig
@@ -637,7 +603,6 @@ F:	package/alljoyn-base/
 F:	package/alljoyn-tcl/
 F:	package/alljoyn-tcl-base/
 F:	package/boinc/
-F:	package/flatbuffers/
 F:	package/gtksourceview/
 F:	package/gssdp/
 F:	package/gupnp/
@@ -646,11 +611,8 @@ F:	package/gupnp-tools/
 F:	package/hiredis/
 F:	package/igd2-for-linux/
 F:	package/libupnp/
-F:	package/libupnp18/
 F:	package/minissdpd/
 F:	package/motion/
-F:	package/rygel/
-F:	package/safeclib/
 F:	package/tinycbor/
 F:	package/tinydtls/

@@ -709,9 +671,8 @@ F:	package/zxing-cpp/
 N:	Gaël Portay <gael.portay@savoirfairelinux.com>
 F:	package/qt5/qt5virtualkeyboard/
 F:	package/qt5/qt5webengine/
-F:	package/qt5/qt5webkit-examples/

-N:	Gary Bisson <bisson.gary@gmail.com>
+N:	Gary Bisson <gary.bisson@boundarydevices.com>
 F:	board/boundarydevices/
 F:	configs/nitrogen*
 F:	package/freescale-imx/
@@ -767,7 +728,6 @@ F:	package/libusbgx/
 F:	package/python-cheetah/
 F:	package/python-markdown/
 F:	package/python-pyqt/
-F:	package/python-remi/
 F:	package/python-sip/

 N:	Henrique Camargo <henrique@henriquecamargo.com>
@@ -787,31 +747,10 @@ F:	package/angularjs/
 N:	Ilias Apalodimas <apalos@gmail.com>
 F:	package/keepalived/

-N:	Ismael Luceno <ismael@iodev.co.uk>
-F:	package/axel/
-
 N:	Jagan Teki <jagan@amarulasolutions.com>
 F:	board/bananapi/
 F:	board/engicam/
-F:	board/friendlyarm/nanopi-a64/
-F:	board/friendlyarm/nanopi-neo2/
-F:	board/olimex/a64-olinuxino/
-F:	board/orangepi/orangepi-pc2/
-F:	board/orangepi/orangepi-prime/
-F:	board/orangepi/orangepi-win/
-F:	board/orangepi/orangepi-zero-plus2/
-F:	board/pine64/
 F:	configs/bananapi_m1_defconfig
-F:	configs/bananapi_m64_defconfig
-F:	configs/friendlyarm_nanopi_a64_defconfig
-F:	configs/friendlyarm_nanopi_neo2_defconfig
-F:	configs/olimex_a64_olinuxino_defconfig
-F:	configs/orangepi_pc2_defconfig
-F:	configs/orangepi_prime_defconfig
-F:	configs/orangepi_win_defconfig
-F:	configs/orangepi_zero_plus2_defconfig
-F:	configs/pine64_defconfig
-F:	configs/pine64_sopine_defconfig
 F:	configs/engicam_imx6qdl_icore_defconfig
 F:	configs/engicam_imx6qdl_icore_qt5_defconfig
 F:	configs/engicam_imx6qdl_icore_rqs_defconfig
@@ -829,13 +768,6 @@ F:	package/pangomm/
 F:	package/rpm/
 F:	package/yad/

-N:	Jan Heylen <jan.heylen@nokia.com>
-F:	package/opentracing-cpp/
-
-N:	Jan Kraval <jan.kraval@gmail.com>
-F:	board/orangepi/orangepi-lite
-F:	configs/orangepi_lite_defconfig
-
 N:	Jan Pedersen <jp@jp-embedded.com>
 F:	package/zip/

@@ -865,11 +797,7 @@ F:	board/qemu/ppc64le-pseries/
 F:	configs/qemu_ppc64le_pseries_defconfig

 N:	Joseph Kogut <joseph.kogut@gmail.com>
-F:	package/gconf/
-F:	package/python-raven/
-F:	package/python-schedule/
 F:	package/python-websockets/
-F:	package/python-xlib/

 N:	Johan Derycke <johanderycke@gmail.com>
 F:	package/python-libconfig/
@@ -947,9 +875,6 @@ 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/
@@ -1005,7 +930,6 @@ F:	package/linuxconsoletools/
 N:	Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
 F:	package/bcusdk/
 F:	package/libpthsem/
-F:	package/nilfs-utils/

 N:	Laurent Cans <laurent.cans@gmail.com>
 F:	package/aircrack-ng/
@@ -1054,12 +978,6 @@ F:	package/python-simplejson/
 F:	package/python-versiontools/
 F:	package/wilc1000-firmware/

-N:	Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
-F:	package/ffmpeg/
-F:	package/mpv/
-F:	package/rpi-firmware/
-F:	package/rpi-userland/
-
 N:	Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
 F:	package/nvme/

@@ -1087,25 +1005,12 @@ F:	package/turbolua/
 N:	Marcin Nowakowski <marcin.nowakowski@imgtec.com>
 F:	package/libkcapi/

-N:	Marcus Folkesson <marcus.folkesson@gmail.com>
-F:	package/libostree/
-F:	package/libselinux/
-F:	package/libsemanage/
-F:	package/libsepol/
-F:	package/selinux-python/
-F:	utils/config
-F:	utils/diffconfig
-
 N:	Marek Belisko <marek.belisko@open-nandra.com>
 F:	package/libatasmart/
 F:	package/polkit/
 F:	package/sg3_utils/
 F:	package/udisks/

-N:	Mario Lang <mlang@blind.guru>
-F:	package/brltty/
-F:	package/lynx/
-
 N:	Mario Rugiero <mrugiero@gmail.com>
 F:	package/ratpoison/

@@ -1145,6 +1050,7 @@ F:	package/crda/
 F:	package/devmem2/
 F:	package/dnsmasq/
 F:	package/dosfstools/
+F:	package/eeprog/
 F:	package/eigen/
 F:	package/ethtool/
 F:	package/flashbench/
@@ -1160,8 +1066,6 @@ F:	package/iperf/
 F:	package/iperf3/
 F:	package/iputils/
 F:	package/iw/
-F:	package/kvm-unit-tests/
-F:	package/kvmtool/
 F:	package/libcsv/
 F:	package/libcurl/
 F:	package/libfcgi/
@@ -1187,7 +1091,6 @@ F:	package/policycoreutils/
 F:	package/proftpd/
 F:	package/protobuf-c/
 F:	package/protobuf/
-F:	package/python-flask-cors/
 F:	package/python-ipy/
 F:	package/python-posix-ipc/
 F:	package/python-pypcap/
@@ -1203,7 +1106,6 @@ F:	package/unionfs/
 F:	package/valijson/
 F:	package/wpa_supplicant/
 F:	package/wireless_tools/
-F:	package/xen/

 N:	Mauro Condarelli <mc5686@mclink.it>
 F:	package/mc/
@@ -1260,7 +1162,7 @@ F:	package/systemd-bootchart/
 F:	package/tinyalsa/
 F:	package/tinyxml/

-N:	Maxime Ripard <maxime.ripard@bootlin.com>
+N:	Maxime Ripard <maxime.ripard@free-electrons.com>
 F:	package/kmsxx/

 N:	Michael Rommel <rommel@layer-7.net>
@@ -1289,9 +1191,6 @@ N:	Mike Harmony <mike.harmony@snapav.com>
 F:	board/sinovoip/m2-plus/
 F:	configs/bananapi_m2_plus_defconfig

-N:	Mylène Josserand <mylene.josserand@bootlin.com>
-F:	package/rtl8723bu/
-
 N:	Nathan Lynch <ntl@pobox.com>
 F:	package/chrony/

@@ -1315,9 +1214,6 @@ N:	Noé Rubinstein <noe.rubinstein@gmail.com>
 F:	package/tpm-tools/
 F:	package/trousers/

-N:	Norbert Lange <nolange79@gmail.com>
-F:	package/tcf-agent/
-
 N:	Olaf Rempel <razzor@kopf-tisch.de>
 F:	package/ctorrent/

@@ -1330,7 +1226,6 @@ F:	package/python-pyelftools/

 N:	Olivier Schonken <olivier.schonken@gmail.com>
 F:	package/cups/
-F:	package/cups-filters/
 F:	package/ijs/
 F:	package/poppler/
 F:	package/qpdf/
@@ -1348,8 +1243,10 @@ F:	package/google-breakpad/
 N:	Patrick Gerber <kpa_info@yahoo.fr>
 F:	package/yavta/

-N:	Paul Cercueil <paul@crapouillou.net>
+N:	Paul Cercueil <paul.cercueil@analog.com>
 F:	package/libiio/
+
+N:	Paul Cercueil <paul@crapouillou.net>
 F:	package/lightning/

 N:	Pedro Aguilar <paguilar@paguilar.org>
@@ -1371,7 +1268,6 @@ F:	package/mosquitto/
 F:	package/python-alsaaudio/
 F:	package/python-enum/
 F:	package/python-enum34/
-F:	package/python-functools32/
 F:	package/python-ipaddr/
 F:	package/python-pam/
 F:	package/python-psutil/
@@ -1507,17 +1403,14 @@ F:	package/iqvlinux/
 F:	package/irrlicht/
 F:	package/liblinear/
 F:	package/lensfun/
-F:	package/libgta/
 F:	package/libspatialindex/
 F:	package/linux-syscall-support/
 F:	package/lugaru/
 F:	package/mcelog/
-F:	package/mesa3d/
 F:	package/minetest/
 F:	package/minetest-game/
 F:	package/openpowerlink/
 F:	package/physfs/
-F:	package/solarus/
 F:	package/stress-ng/
 F:	package/supertux/
 F:	package/supertuxkart/
@@ -1525,6 +1418,9 @@ F:	package/terminology/
 F:	package/upower/
 F:	package/xenomai/

+N:	Romain Perier <romain.perier@free-electrons.com>
+F:	package/amd-catalyst/
+
 N:	Ryan Barnett <ryan.barnett@rockwellcollins.com>
 F:	package/atftp/
 F:	package/miraclecast/
@@ -1588,36 +1484,14 @@ F:	package/lua-resty-http/
 F:	package/mpir/

 N:	Sergey Matyukevich <geomatsi@gmail.com>
-F:	boot/arm-trusted-firmware/
-F:	boot/binaries-marvell/
-F:	boot/mv-ddr-marvell/
-F:	board/linksprite/pcduino
-F:	board/orangepi/orangepi-zero
-F:	board/orangepi/orangepi-one
-F:	board/orangepi/orangepi-pc-plus/
-F:	board/solidrun/macchiatobin
-F:	configs/linksprite_pcduino_defconfig
-F:	configs/orangepi_one_defconfig
-F:	configs/orangepi_pc_plus_defconfig
-F:	configs/orangepi_zero_defconfig
-F:	configs/solidrun_macchiatobin_mainline_defconfig
-F:	configs/solidrun_macchiatobin_marvell_defconfig
-F:	package/armbian-firmware/
-F:	package/rtl8189fs/
 F:	package/xr819-xradio/

 N:	Sergio Prado <sergio.prado@e-labworks.com>
-F:	package/aoetools/
-F:	package/curlpp/
-F:	package/daq/
 F:	package/libgdiplus/
 F:	package/mongodb/
-F:	package/pimd/
 F:	package/stella/
-F:	package/traceroute/
 F:	package/tunctl/
 F:	package/ubus/
-F:	package/wolfssl/

 N:	Simon Dawson <spdawson@gmail.com>
 F:	boot/at91bootstrap3/
@@ -1668,7 +1542,6 @@ F:	package/elfutils/
 F:	package/libtasn1/
 F:	package/proxychains-ng/
 F:	package/yasm/
-F:	package/zlib-ng/

 N:	Stefan Sørensen <stefan.sorensen@spectralink.com>
 F:	package/cracklib/
@@ -1720,7 +1593,6 @@ 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/
@@ -1745,7 +1617,7 @@ F:	support/scripts/size-stats
 F:	utils/size-stats-compare
 F:	toolchain/

-N:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+N:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 F:	arch/Config.in.arm
 F:	boot/boot-wrapper-aarch64/
 F:	boot/grub2/
@@ -1803,9 +1675,6 @@ F:	toolchain/
 N:	Tiago Brusamarello <tiago.brusamarello@datacom.ind.br>
 F:	package/aer-inject/

-N:	Timo Ketola <timo.ketola@exertus.fi>
-F:	package/fbgrab/
-
 N:	Tzu-Jung Lee <roylee17@gmail.com>
 F:	package/dropwatch/
 F:	package/tstools/
@@ -1834,10 +1703,6 @@ F:	package/pixz/
 N:	Vinicius Tinti <viniciustinti@gmail.com>
 F:	package/python-thrift/

-N:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>
-F:	board/technologic/ts5500/
-F:	configs/ts5500_defconfig
-
 N:	Volkov Viacheslav <sv99@inbox.ru>
 F:	package/v4l2grab/
 F:	package/zbar/
@@ -1862,6 +1727,9 @@ F:	package/libmicrohttpd/
 F:	package/sysprof/
 F:	package/time/

+N:	Will Newton <will.newton@imgtec.com>
+F:	package/numactl/
+
 N:	Will Wagner <will_wagner@carallon.com>
 F:	package/yaffs2utils/

@@ -1894,7 +1762,6 @@ F:	package/libiscsi/
 F:	package/libpri/
 F:	package/libseccomp/
 F:	package/libss7/
-F:	package/linux-firmware/
 F:	package/linux-tools/
 F:	package/matchbox*
 F:	package/mesa3d-headers/
@@ -1918,7 +1785,6 @@ F:	package/vde2/
 F:	package/w_scan/
 F:	package/wayland/
 F:	package/weston/
-F:	package/zisofs-tools/
 F:	support/download/

 N:	Yegor Yefremov <yegorslists@googlemail.com>
@@ -1949,7 +1815,6 @@ F:	package/modem-manager/
 F:	package/nuttcp/
 F:	package/parted/
 F:	package/phytool/
-F:	package/poco/
 F:	package/python*
 F:	package/ser2net/
 F:	package/socketcand/
@@ -1961,10 +1826,9 @@ 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/
 F:	package/python-configobj/
 F:	package/python-iniparse/
 F:	package/qjson/
--- a/64
+++ b/64
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2006-2014 by the Buildroot developers <buildroot@uclibc.org>
-# Copyright (C) 2014-2019 by the Buildroot developers <buildroot@buildroot.org>
+# Copyright (C) 2014-2017 by the Buildroot developers <buildroot@buildroot.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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.02.12
+export BR2_VERSION := 2017.11.2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1553870000
+BR2_VERSION_EPOCH = 1516569000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -146,7 +141,7 @@ noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconf
 # We're building in two situations: when MAKECMDGOALS is empty
 # (default target is to build), or when MAKECMDGOALS contains
 # something else than one of the nobuild_targets.
-nobuild_targets := source %-source \
+nobuild_targets := source %-source source-check \
 	legal-info %-legal-info external-deps _external-deps \
 	clean distclean help show-targets graph-depends \
 	%-graph-depends %-show-depends %-show-version \
@@ -360,36 +355,14 @@ 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)
 HOSTCC_VERSION := $(firstword $(HOSTCC_VERSION))
 endif

-ifeq ($(BR2_NEEDS_HOST_UTF8_LOCALE),y)
-# First, we try to use the user's configured locale (as that's the
-# language they'd expect messages to be displayed), then we favour
-# a non language-specific locale like C.UTF-8 if one is available,
-# so we sort with the C locale to get it at the top.
-# This is guaranteed to not be empty, because of the check in
-# support/dependencies/dependencies.sh
-HOST_UTF8_LOCALE := $(shell \
-			( echo $${LC_ALL:-$${LC_MESSAGES:-$${LANG}}}; \
-			  locale -a 2>/dev/null | LC_ALL=C sort \
-			) \
-			| grep -i -E 'utf-?8$$' \
-			| head -n 1)
-HOST_UTF8_LOCALE_ENV := LC_ALL=$(HOST_UTF8_LOCALE)
-endif
-
 # Make sure pkg-config doesn't look outside the buildroot tree
 HOST_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 unexport PKG_CONFIG_PATH
@@ -431,8 +404,6 @@ unexport TERMINFO
 unexport MACHINE
 unexport O
 unexport GCC_COLORS
-unexport PLATFORM
-unexport OS

 GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)

@@ -708,10 +679,6 @@ $(TARGETS_ROOTFS): target-finalize
 .PHONY: target-finalize
 target-finalize: $(PACKAGES)
 	@$(call MESSAGE,"Finalizing target directory")
-	# Check files that are touched by more than one package
-	./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
-	./support/scripts/check-uniq-files -t staging $(BUILD_DIR)/packages-file-list-staging.txt
-	./support/scripts/check-uniq-files -t host $(BUILD_DIR)/packages-file-list-host.txt
 	$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
 		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
@@ -758,8 +725,7 @@ endif
 		echo "ID=buildroot"; \
 		echo "VERSION_ID=$(BR2_VERSION)"; \
 		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
-	) >  $(TARGET_DIR)/usr/lib/os-release
-	ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc
+	) >  $(TARGET_DIR)/etc/os-release

 	@$(call MESSAGE,"Sanitizing RPATH in target tree")
 	$(TOPDIR)/support/scripts/fix-rpath target
@@ -774,8 +740,6 @@ endif
 		$(call MESSAGE,"Executing post-build script $(s)"); \
 		$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

-	touch $(TARGET_DIR)/usr
-
 .PHONY: target-post-image
 target-post-image: $(TARGETS_ROOTFS) target-finalize
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
@@ -790,6 +754,10 @@ _external-deps: $(foreach p,$(PACKAGES),$(p)-all-external-deps)
 external-deps:
 	@$(MAKE1) -Bs $(EXTRAMAKEARGS) _external-deps | sort -u

+# check if download URLs are outdated
+.PHONY: source-check
+source-check: $(foreach p,$(PACKAGES),$(p)-all-source-check)
+
 .PHONY: legal-info-clean
 legal-info-clean:
 	@rm -fr $(LEGAL_INFO_DIR)
@@ -821,7 +789,7 @@ legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p

 .PHONY: show-targets
 show-targets:
-	@echo $(sort $(PACKAGES)) $(sort $(TARGETS_ROOTFS))
+	@echo $(PACKAGES) $(TARGETS_ROOTFS)

 .PHONY: show-build-order
 show-build-order: $(patsubst %,%-show-build-order,$(PACKAGES))
@@ -989,8 +957,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)), \
@@ -1033,8 +1000,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'
@@ -1077,6 +1044,7 @@ help:
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
+	@echo '  source-check           - check selected packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
 	@echo '  legal-info             - generate info about license compliance'
 	@echo '  printvars              - dump all the internal variables'
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -79,7 +79,6 @@ config BR2_aarch64_be
 config BR2_bfin
 	bool "Blackfin"
 	select BR2_ARCH_HAS_FDPIC_SUPPORT
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	help
 	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
 	  manufactured and marketed by Analog Devices.
@@ -262,27 +261,6 @@ config BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
 	bool
 	default y if !BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT

-# The following symbols are selected by the individual
-# Config.in.$ARCH files
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
-	bool
-
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
-
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -59,42 +59,29 @@ config BR2_ARM_CPU_ARMV7A
 config BR2_ARM_CPU_ARMV7M
 	bool

-config BR2_ARM_CPU_ARMV8A
+config BR2_ARM_CPU_ARMV8
 	bool

 choice
 	prompt "Target Architecture Variant"
-	default BR2_cortex_a53 if BR2_ARCH_IS_64
 	default BR2_arm926t
 	help
 	  Specific CPU variant to use

-if !BR2_ARCH_IS_64
-comment "armv4 cores"
 config BR2_arm920t
 	bool "arm920t"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV4
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_arm922t
 	bool "arm922t"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV4
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-config BR2_fa526
-	bool "fa526/626"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_ARMV4
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-config BR2_strongarm
-	bool "strongarm sa110/sa1100"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_ARMV4
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-
-comment "armv5 cores"
+	depends on !BR2_ARCH_IS_64
 config BR2_arm926t
 	bool "arm926t"
 	select BR2_ARM_CPU_HAS_ARM
@@ -102,25 +89,14 @@ config BR2_arm926t
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV5
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-config BR2_iwmmxt
-	bool "iwmmxt"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_ARMV5
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-config BR2_xscale
-	bool "xscale"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_THUMB
-	select BR2_ARM_CPU_ARMV5
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-
-comment "armv6 cores"
+	depends on !BR2_ARCH_IS_64
 config BR2_arm1136j_s
 	bool "arm1136j-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_arm1136jf_s
 	bool "arm1136jf-s"
 	select BR2_ARM_CPU_HAS_ARM
@@ -128,12 +104,14 @@ config BR2_arm1136jf_s
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
 	select BR2_ARM_CPU_HAS_ARM
@@ -141,6 +119,7 @@ config BR2_arm1176jzf_s
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_arm11mpcore
 	bool "mpcore"
 	select BR2_ARM_CPU_HAS_ARM
@@ -148,8 +127,7 @@ config BR2_arm11mpcore
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-
-comment "armv7a cores"
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a5
 	bool "cortex-A5"
 	select BR2_ARM_CPU_HAS_ARM
@@ -158,6 +136,7 @@ config BR2_cortex_a5
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a7
 	bool "cortex-A7"
 	select BR2_ARM_CPU_HAS_ARM
@@ -166,6 +145,7 @@ config BR2_cortex_a7
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a8
 	bool "cortex-A8"
 	select BR2_ARM_CPU_HAS_ARM
@@ -174,6 +154,7 @@ config BR2_cortex_a8
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a9
 	bool "cortex-A9"
 	select BR2_ARM_CPU_HAS_ARM
@@ -182,6 +163,7 @@ config BR2_cortex_a9
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a12
 	bool "cortex-A12"
 	select BR2_ARM_CPU_HAS_ARM
@@ -190,6 +172,7 @@ config BR2_cortex_a12
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a15
 	bool "cortex-A15"
 	select BR2_ARM_CPU_HAS_ARM
@@ -198,6 +181,7 @@ config BR2_cortex_a15
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a15_a7
 	bool "cortex-A15/A7 big.LITTLE"
 	select BR2_ARM_CPU_HAS_ARM
@@ -206,7 +190,7 @@ config BR2_cortex_a15_a7
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a17
 	bool "cortex-A17"
 	select BR2_ARM_CPU_HAS_ARM
@@ -215,7 +199,7 @@ config BR2_cortex_a17
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a17_a7
 	bool "cortex-A17/A7 big.LITTLE"
 	select BR2_ARM_CPU_HAS_ARM
@@ -224,52 +208,14 @@ config BR2_cortex_a17_a7
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-config BR2_pj4
-	bool "pj4"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_VFPV3
-	select BR2_ARM_CPU_ARMV7A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-
-comment "armv7m cores"
-config BR2_cortex_m3
-	bool "cortex-M3"
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_ARMV7M
-config BR2_cortex_m4
-	bool "cortex-M4"
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_ARMV7M
-endif # !BR2_ARCH_IS_64
-
-comment "armv8 cores"
-config BR2_cortex_a32
-	bool "cortex-A32"
 	depends on !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_NEON
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-config BR2_cortex_a35
-	bool "cortex-A35"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a53
 	bool "cortex-A53"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a57
 	bool "cortex-A57"
@@ -277,7 +223,7 @@ config BR2_cortex_a57
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a57_a53
 	bool "cortex-A57/A53 big.LITTLE"
@@ -285,147 +231,66 @@ config BR2_cortex_a57_a53
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a72
 	bool "cortex-A72"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_cortex_a72_a53
 	bool "cortex-A72/A53 big.LITTLE"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-config BR2_cortex_a73
-	bool "cortex-A73"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+config BR2_cortex_m3
+	bool "cortex-M3"
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_ARMV7M
+	depends on !BR2_ARCH_IS_64
+config BR2_cortex_m4
+	bool "cortex-M4"
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_ARMV7M
+	depends on !BR2_ARCH_IS_64
+config BR2_fa526
+	bool "fa526/626"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_ARMV4
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_cortex_a73_a35
-	bool "cortex-A73/A35 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	depends on !BR2_ARCH_IS_64
+config BR2_pj4
+	bool "pj4"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_VFPV3
+	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_cortex_a73_a53
-	bool "cortex-A73/A53 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	depends on !BR2_ARCH_IS_64
+config BR2_strongarm
+	bool "strongarm sa110/sa1100"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_ARMV4
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_exynos_m1
-	bool "exynos-m1"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	depends on !BR2_ARCH_IS_64
+config BR2_xscale
+	bool "xscale"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_THUMB
+	select BR2_ARM_CPU_ARMV5
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-if BR2_ARCH_IS_64
-config BR2_falkor
-	bool "falkor"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
+	depends on !BR2_ARCH_IS_64
+config BR2_iwmmxt
+	bool "iwmmxt"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_ARMV5
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_qdf24xx
-	bool "qdf24xx"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-config BR2_thunderx
-	bool "thunderx"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-config BR2_thunderxt81
-	bool "thunderxt81"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_thunderxt83
-	bool "thunderxt83"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_thunderxt88
-	bool "thunderxt88"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_thunderxt88p1
-	bool "thunderxt88p1"
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-endif # BR2_ARCH_IS_64
-config BR2_xgene1
-	bool "xgene1"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-
-if BR2_ARCH_IS_64
-comment "armv8.1a cores"
-config BR2_thunderx2t99
-	bool "thunderx2t99"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_thunderx2t99p1
-	bool "thunderx2t99p1"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_vulcan
-	bool "vulcan"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-endif # BR2_ARCH_IS_64
+	depends on !BR2_ARCH_IS_64
 endchoice

 config BR2_ARM_ENABLE_NEON
@@ -680,23 +545,15 @@ config BR2_ENDIAN
 	default "BIG"	 if (BR2_armeb || BR2_aarch64_be)

 config BR2_GCC_TARGET_CPU
-	# armv4
 	default "arm920t"	if BR2_arm920t
 	default "arm922t"	if BR2_arm922t
-	default "fa526"		if BR2_fa526
-	default "strongarm"	if BR2_strongarm
-	# armv5
 	default "arm926ej-s"	if BR2_arm926t
-	default "iwmmxt"	if BR2_iwmmxt
-	default "xscale"	if BR2_xscale
-	# armv6
 	default "arm1136j-s"	if BR2_arm1136j_s
 	default "arm1136jf-s"	if BR2_arm1136jf_s
 	default "arm1176jz-s"	if BR2_arm1176jz_s
 	default "arm1176jzf-s"	if BR2_arm1176jzf_s
 	default "mpcore"	if BR2_arm11mpcore && BR2_ARM_CPU_HAS_VFPV2
 	default "mpcorenovfp"	if BR2_arm11mpcore
-	# armv7a
 	default "cortex-a5"	if BR2_cortex_a5
 	default "cortex-a7"	if BR2_cortex_a7
 	default "cortex-a8"	if BR2_cortex_a8
@@ -706,34 +563,18 @@ config BR2_GCC_TARGET_CPU
 	default "cortex-a15.cortex-a7"	if BR2_cortex_a15_a7
 	default "cortex-a17"	if BR2_cortex_a17
 	default "cortex-a17.cortex-a7"	if BR2_cortex_a17_a7
-	default "marvell-pj4"	if BR2_pj4
-	# armv7m
 	default "cortex-m3"	if BR2_cortex_m3
 	default "cortex-m4"	if BR2_cortex_m4
-	# armv8a
-	default "cortex-a32"	if BR2_cortex_a32
-	default "cortex-a35"	if BR2_cortex_a35
+	default "fa526"		if BR2_fa526
+	default "marvell-pj4"	if BR2_pj4
+	default "strongarm"	if BR2_strongarm
+	default "xscale"	if BR2_xscale
+	default "iwmmxt"	if BR2_iwmmxt
 	default "cortex-a53"	if BR2_cortex_a53
 	default "cortex-a57"	if BR2_cortex_a57
 	default "cortex-a57.cortex-a53"	if BR2_cortex_a57_a53
 	default "cortex-a72"	if BR2_cortex_a72
 	default "cortex-a72.cortex-a53"	if BR2_cortex_a72_a53
-	default "cortex-a73"	if BR2_cortex_a73
-	default "cortex-a73.cortex-a35"	if BR2_cortex_a73_a35
-	default "cortex-a73.cortex-a53"	if BR2_cortex_a73_a53
-	default "exynos-m1"	if BR2_exynos_m1
-	default "falkor"	if BR2_falkor
-	default "qdf24xx"	if BR2_qdf24xx
-	default "thunderx"	if BR2_thunderx
-	default "thunderxt81"	if BR2_thunderxt81
-	default "thunderxt83"	if BR2_thunderxt83
-	default "thunderxt88"	if BR2_thunderxt88
-	default "thunderxt88p1"	if BR2_thunderxt88p1
-	default "xgene1"	if BR2_xgene1
-	# armv8.1a
-	default "thunderx2t99"	if BR2_thunderx2t99
-	default "thunderx2t99p1"	if BR2_thunderx2t99p1
-	default "vulcan"	if BR2_vulcan

 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"	if BR2_arm || BR2_armeb
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -7,11 +7,9 @@ config BR2_MIPS_CPU_MIPS32R2
 	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS32R5
 	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_MIPS_CPU_MIPS32R6
 	bool
 	select BR2_MIPS_NAN_2008
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_MIPS_CPU_MIPS64
 	bool
 	select BR2_MIPS_NAN_LEGACY
@@ -20,11 +18,9 @@ config BR2_MIPS_CPU_MIPS64R2
 	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS64R5
 	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_MIPS_CPU_MIPS64R6
 	bool
 	select BR2_MIPS_NAN_2008
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5

 choice
 	prompt "Target Architecture Variant"
@@ -57,13 +53,11 @@ config BR2_mips_interaptiv
 	bool "interAptiv"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_mips_m5150
 	bool "M5150"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R5
 	select BR2_MIPS_NAN_2008
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_mips_m6250
 	bool "M6250"
 	depends on !BR2_ARCH_IS_64
@@ -107,7 +101,6 @@ config BR2_mips_i6400
 	bool "I6400"
 	depends on BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS64R6
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_mips_p6600
 	bool "P6600"
 	depends on BR2_ARCH_IS_64
@@ -146,7 +139,7 @@ config BR2_MIPS_SOFT_FLOAT
 choice
 	prompt "FP mode"
 	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
-	default BR2_MIPS_FP32_MODE_XX
+	default BR2_MIPS_FP32_MODE_XX if BR2_TOOLCHAIN_HAS_MFPXX_OPTION
 	help
 	  MIPS32 supports different FP modes (32,xx,64). Information about FP
 	  modes can be found here:
@@ -159,7 +152,7 @@ config BR2_MIPS_FP32_MODE_32

 config BR2_MIPS_FP32_MODE_XX
 	bool "xx"
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+	depends on BR2_TOOLCHAIN_HAS_MFPXX_OPTION

 config BR2_MIPS_FP32_MODE_64
 	bool "64"
@@ -176,10 +169,10 @@ config BR2_MIPS_NAN_LEGACY

 config BR2_MIPS_NAN_2008
 	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9

 choice
 	prompt "Target NaN"
+	depends on BR2_TOOLCHAIN_HAS_MNAN_OPTION
 	depends on BR2_mips_32r5 || BR2_mips_64r5
 	default BR2_MIPS_ENABLE_NAN_2008
 	help
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -129,15 +129,6 @@ config BR2_x86_atom
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
 	select BR2_X86_CPU_HAS_SSSE3
-config BR2_x86_silvermont
-	bool "silvermont"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_k6
 	bool "k6"
 	select BR2_X86_CPU_HAS_MMX
@@ -238,7 +229,6 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_corei7_avx && BR2_i386
 	default "i686"		if BR2_x86_corei7_avx2 && BR2_i386
 	default "i686"		if BR2_x86_atom && BR2_i386
-	default "i686"		if BR2_x86_silvermont && BR2_i386
 	default "i686"		if BR2_x86_opteron && BR2_i386
 	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
 	default "i686"		if BR2_x86_barcelona && BR2_i386
@@ -271,7 +261,6 @@ config BR2_GCC_TARGET_ARCH
 	default "corei7-avx"	if BR2_x86_corei7_avx
 	default "core-avx2"	if BR2_x86_core_avx2
 	default "atom"		if BR2_x86_atom
-	default "silvermont"	if BR2_x86_silvermont
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
 	default "barcelona"	if BR2_x86_barcelona
--- a/board/armadeus/apf28/linux-4.4.config
+++ b/board/armadeus/apf28/linux-4.4.config
@@ -0,0 +1,185 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_BSD_DISKLABEL=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_MXS=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CPU_IDLE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+CONFIG_CAN=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_FLEXCAN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_MAC80211_RC_PID=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER=m
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+# CONFIG_M25PXX_USE_FAST_READ is not set
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_GPMI_NAND=y
+CONFIG_MTD_UBI=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_NETDEVICES=y
+CONFIG_RTL8187=m
+CONFIG_RT2X00=m
+CONFIG_RT73USB=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MXS_AUART=y
+CONFIG_TTY_PRINTK=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MXS=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_MXS=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_HWMON=m
+CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_FB=y
+CONFIG_FB_MXS=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_USB=y
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_WDM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_ETH=m
+CONFIG_MMC=y
+CONFIG_MMC_MXS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_STMP=y
+CONFIG_DMADEVICES=y
+CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_MXS_LRADC=y
+CONFIG_IIO=y
+CONFIG_PWM=y
+CONFIG_PWM_MXS=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_DEBUG_FS=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
--- a/board/atmel/at91sam9x5ek_mmc/post-image.sh
+++ b/board/atmel/at91sam9x5ek_mmc/post-image.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+echo --rootpath "${TARGET_DIR}"
+echo --tmppath "${GENIMAGE_TMP}"
+echo --inputpath "${BINARIES_DIR}"
+echo --outputpath "${BINARIES_DIR}"
+echo --config "${GENIMAGE_CFG}"
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/atmel/flasher.sh
+++ b/board/atmel/flasher.sh
@@ -130,6 +130,7 @@ if [[ $BOARD == "*pda4" ]]; then
 	video_mode="video=LVDS-1:480x272-16"
 fi

-echo "Executing: ${!F} O=$1/images $1/host/bin/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode"
+echo "Executing: ${!F} O=$1/images $1/host/opt/sam-ba/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode"
 export O=$1/images
-$1/host/bin/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode
+$1/host/opt/sam-ba/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode
+
--- a/board/atmel/sama5d27_som1_ek_mmc/post-image.sh
+++ b/board/atmel/sama5d27_som1_ek_mmc/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/atmel/sama5d2_xplained_mmc/post-image.sh
+++ b/board/atmel/sama5d2_xplained_mmc/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/atmel/sama5d3_xplained_mmc/post-image.sh
+++ b/board/atmel/sama5d3_xplained_mmc/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/atmel/sama5d4_xplained_mmc/post-image.sh
+++ b/board/atmel/sama5d4_xplained_mmc/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/bananapi/bananapi-m64/boot.cmd
+++ b/board/bananapi/bananapi-m64/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-a64-bananapi-m64.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/bananapi/bananapi-m64/genimage.cfg
+++ b/board/bananapi/bananapi-m64/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-bananapi-m64.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/bananapi/bananapi-m64/readme.txt
+++ b/board/bananapi/bananapi-m64/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Bananapi M64. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Bananapi M64 link:
-http://www.banana-pi.org/m64.html
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M64
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make bananapi_m64_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Bananapi M64 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/boundarydevices/common/boot.cmd
+++ b/board/boundarydevices/common/boot.cmd
@@ -1,155 +0,0 @@
-setenv bootargs ''
-
-setenv initrd_high 0xffffffff
-m4=''
-a_base=0x10000000
-if itest.s x51 == "x${imx_cpu}" ; then
-	a_base=0x90000000
-elif itest.s x53 == "x${imx_cpu}"; then
-	a_base=0x70000000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
-	a_base=0x80000000
-	if itest.s "x1" == "x$m4enabled" ; then
-		run m4boot;
-		m4='-m4';
-	fi
-fi
-
-setexpr a_script  ${a_base} + 0x00800000
-setexpr a_zImage  ${a_base} + 0x00800000
-setexpr a_fdt     ${a_base} + 0x03000000
-setexpr a_ramdisk ${a_base} + 0x03800000
-setexpr a_initrd  ${a_base} + 0x03a00000
-setexpr a_reset_cause_marker ${a_base} + 0x80
-setexpr a_reset_cause	     ${a_base} + 0x84
-
-if itest.s "x" == "x${board}" ; then
-	echo "!!!! Error: Your u-boot is outdated. Please upgrade.";
-	exit;
-fi
-
-if itest.s "x" == "x${fdt_file}" ; then
-	if itest.s x6SOLO == "x${imx_cpu}" ; then
-		fdt_file=imx6dl-${board}.dtb;
-	elif itest.s x6DL == "x${imx_cpu}" ; then
-		fdt_file=imx6dl-${board}.dtb;
-	elif itest.s x6QP == "x${imx_cpu}" ; then
-		fdt_file=imx6qp-${board}.dtb;
-	elif itest.s x6SX == "x${imx_cpu}" ; then
-		fdt_file=imx6sx-${board}${m4}.dtb;
-	elif itest.s x7D == "x${imx_cpu}" ; then
-		fdt_file=imx7d-${board}${m4}.dtb;
-	elif itest.s x51 == "x${imx_cpu}" ; then
-		fdt_file=imx51-${board}${m4}.dtb;
-	elif itest.s x53 == "x${imx_cpu}" ; then
-		fdt_file=imx53-${board}${m4}.dtb;
-	else
-		fdt_file=imx6q-${board}.dtb;
-	fi
-fi
-
-if itest.s x${distro_bootpart} == x ; then
-	distro_bootpart=1
-fi
-
-if load ${devtype} ${devnum}:${distro_bootpart} ${a_script} uEnv.txt ; then
-    env import -t ${a_script} ${filesize}
-fi
-
-setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${imx_cpu} board=${board}
-
-if load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${prefix}${fdt_file} ; then
-	fdt addr ${a_fdt}
-	setenv fdt_high 0xffffffff
-else
-	echo "!!!! Error loading ${prefix}${fdt_file}";
-	exit;
-fi
-
-cmd_xxx_present=
-fdt resize
-if itest.s "x" != "x${cmd_custom}" ; then
-	run cmd_custom
-	cmd_xxx_present=1;
-fi
-
-if itest.s "x" != "x${cmd_hdmi}" ; then
-	run cmd_hdmi
-	cmd_xxx_present=1;
-	if itest.s x == x${allow_noncea} ; then
-		setenv bootargs ${bootargs} mxc_hdmi.only_cea=1;
-		echo "only CEA modes allowed on HDMI port";
-	else
-		setenv bootargs ${bootargs} mxc_hdmi.only_cea=0;
-		echo "non-CEA modes allowed on HDMI, audio may be affected";
-	fi
-fi
-
-if itest.s "x" != "x${cmd_lcd}" ; then
-	run cmd_lcd
-	cmd_xxx_present=1;
-fi
-if itest.s "x" != "x${cmd_lcd2}" ; then
-	run cmd_lcd2
-	cmd_xxx_present=1;
-fi
-if itest.s "x" != "x${cmd_lvds}" ; then
-	run cmd_lvds
-	cmd_xxx_present=1;
-fi
-if itest.s "x" != "x${cmd_lvds2}" ; then
-	run cmd_lvds2
-	cmd_xxx_present=1;
-fi
-
-if itest.s "x" == "x${cmd_xxx_present}" ; then
-	echo "!!!!!!!!!!!!!!!!"
-	echo "warning: your u-boot may be outdated, please upgrade"
-	echo "!!!!!!!!!!!!!!!!"
-fi
-
-if test "sata" = "${devtype}" ; then
-	setenv bootargs "${bootargs} root=/dev/sda${distro_bootpart}" ;
-elif test "usb" = "${devtype}" ; then
-	setenv bootargs "${bootargs} root=/dev/sda${distro_bootpart}" ;
-else
-	setenv bootargs "${bootargs} root=/dev/mmcblk${devnum}p${distro_bootpart}"
-fi
-
-if itest.s "x" != "x${disable_msi}" ; then
-	setenv bootargs ${bootargs} pci=nomsi
-fi;
-
-if itest.s "x" != "x${disable_giga}" ; then
-	setenv bootargs ${bootargs} fec.disable_giga=1
-fi
-
-if itest.s "x" != "x${wlmac}" ; then
-	setenv bootargs ${bootargs} wlcore.mac=${wlmac}
-	setenv bootargs ${bootargs} wlan.mac=${wlmac}
-fi
-
-if itest.s "x" != "x${gpumem}" ; then
-	setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem}
-fi
-
-if itest.s "x" != "x${cma}" ; then
-	setenv bootargs ${bootargs} cma=${cma}
-fi
-
-if itest.s "x" != "x${loglevel}" ; then
-	setenv bootargs ${bootargs} loglevel=${loglevel}
-fi
-
-if itest.s "x" != "x${show_fdt}" ; then
-	fdt print /
-fi
-
-if itest.s "x" != "x${show_env}" ; then
-	printenv
-fi
-
-if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}zImage ; then
-	bootz ${a_zImage} - ${a_fdt}
-fi
-echo "Error loading kernel image"
--- a/board/boundarydevices/common/post-build.sh
+++ b/board/boundarydevices/common/post-build.sh
@@ -7,9 +7,7 @@

 BOARD_DIR="$(dirname $0)"

-# bd u-boot looks for standard bootscript
-install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/
-# legacy 6x_bootscript script
+# bd u-boot looks for bootscript here
 $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

@@ -18,8 +16,5 @@ 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
@@ -1,154 +0,0 @@
-if itest.s a$uboot_defconfig == a; then
-        echo "Please set uboot_defconfig to the appropriate value"
-        exit
-fi
-
-offset=0x400
-erase_size=0xC0000
-qspi_offset=0x0
-a_base=0x12000000
-
-if itest.s x51 == "x${imx_cpu}"; then
-	a_base=0x92000000
-elif itest.s x53 == "x${imx_cpu}"; then
-	a_base=0x72000000
-elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
-	a_base=0x82000000
-fi
-
-qspi_match=1
-setexpr a_qspi1 ${a_base}
-setexpr a_qspi2 ${a_qspi1} + 0x400000
-setexpr a_uImage1 ${a_qspi1} + 0x400
-setexpr a_uImage2 ${a_qspi2} + 0x400
-setexpr a_script ${a_base}
-
-setenv stdout serial,vga
-
-if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then
-	echo "probed SPI ROM" ;
-else
-	echo "Error initializing EEPROM"
-	exit
-fi
-
-if itest.s x7D == "x${imx_cpu}"; then
-	echo "check qspi parameter block" ;
-	if ${fs}load ${devtype} ${devnum}:1 ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then
-	else
-		echo "parameter file qspi-${sfname}.${uboot_defconfig} not found on SD card"
-		exit
-	fi
-	if itest ${filesize} != 0x200 ; then
-		echo "------- qspi-${sfname}.${uboot_defconfig} 0x${filesize} != 0x200 bytes" ;
-		exit
-	fi
-	setexpr a_marker ${a_qspi1} + 0x1fc
-	if itest *${a_marker} != c0ffee01 ; then
-		echo "------- qspi-${sfname}.${uboot_defconfig} c0ffee01 marker missing" ;
-		exit
-	fi
-	if sf read ${a_qspi2} ${qspi_offset} 0x200 ; then
-	else
-		echo "Error reading qspi parameter from EEPROM"
-		exit
-	fi
-	if cmp.b ${a_qspi1} ${a_qspi2} 0x200 ; then
-		echo "------- qspi parameters match"
-	else
-		echo "------- qspi parameters mismatch"
-		qspi_match=0
-	fi
-fi
-
-echo "check U-Boot" ;
-
-if ${fs}load ${devtype} ${devnum}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then
-else
-	echo "File u-boot.$uboot_defconfig not found on SD card" ;
-	exit
-fi
-echo "read $filesize bytes from SD card" ;
-if sf read ${a_uImage2} $offset $filesize ; then
-else
-	echo "Error reading boot loader from EEPROM" ;
-	exit
-fi
-
-if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
-	echo "------- U-Boot versions match" ;
-	if itest.s "${qspi_match}" == "1" ; then
-		echo "------- upgrade not needed" ;
-		if itest.s "x" != "x${next}" ; then
-			if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
-				source ${a_script}
-			else
-				echo "${next} not found on SD card"
-			fi
-		fi
-		exit
-	fi
-	erase_size=0x1000
-	if itest.s xMX25L6405D == "x${sfname}"; then
-		erase_size=0x10000
-	fi
-	setexpr filesize ${erase_size} - ${offset}
-fi
-
-echo "Need U-Boot upgrade" ;
-echo "Program in 5 seconds" ;
-for n in 5 4 3 2 1 ; do
-	echo $n ;
-	sleep 1 ;
-done
-echo "erasing" ;
-sf erase 0 ${erase_size} ;
-
-# two steps to prevent bricking
-echo "programming" ;
-setexpr a1 ${a_uImage1} + 0x400
-setexpr o1 ${offset} + 0x400
-setexpr s1 ${filesize} - 0x400
-sf write ${a1} ${o1} ${s1} ;
-sf write ${a_uImage1} $offset 0x400 ;
-
-if itest.s x7D == "x${imx_cpu}"; then
-	sf write ${a_qspi1} ${qspi_offset} 0x200
-fi
-
-echo "verifying" ;
-if sf read ${a_uImage2} $offset $filesize ; then
-else
-	echo "Error re-reading EEPROM" ;
-	exit
-fi
-if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
-else
-	echo "Read verification error" ;
-	exit
-fi
-
-if itest.s x7D == "x${imx_cpu}"; then
-	if sf read ${a_qspi2} ${qspi_offset} 0x200 ; then
-	else
-		echo "Error re-reading qspi" ;
-		exit
-	fi
-	if cmp.b ${a_qspi1} ${a_qspi2} 0x200 ; then
-	else
-		echo "qspi parameter block verification error" ;
-		exit
-	fi
-fi
-
-if itest.s "x" != "x${next}" ; then
-	if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
-		source ${a_script}
-	else
-		echo "${next} not found on ${devtype} ${devnum}"
-	fi
-fi
-
-while echo "---- U-Boot upgraded. reset" ; do
-	sleep 120
-done
--- a/board/ci20/genimage.cfg
+++ b/board/ci20/genimage.cfg
@@ -1,29 +0,0 @@
-image sdcard.img {
-    hdimage {
-    }
-
-    partition uboot-spl {
-        in-partition-table = "no"
-        image = "u-boot-spl.bin"
-        offset = 512
-    }
-
-    partition uboot {
-        in-partition-table = "no"
-        image = "u-boot.img"
-        offset = 14k
-    }
-
-    partition uboot-env {
-        in-partition-table = "no"
-        image = "uboot-env.bin"
-        offset = 526k
-    }
-
-    partition rootfs {
-        partition-type = 0x83
-        image = "rootfs.ext4"
-        offset = 2M
-        size = 60M
-    }
-}
--- 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/ci20/readme.txt
+++ b/board/ci20/readme.txt
@@ -2,45 +2,41 @@
 * MIPS Creator CI20 *
 *********************

-Introduction
-============
-
 The 'ci20_defconfig' will create a root filesystem and a kernel image
 under the 'output/images/' directory. This document will try to explain how
 to use them in order to run Buildroot in the MIPS Creator CI20 board.

-How to build it
-===============
+Assuming you are at the U-Boot prompt of the MIPS Creator CI20, you have to
+load the generated kernel image by using the 'tftpboot' command. In
+order to do that, you will need to get the network working. Here you
+have the instructions to set the ip address, netmask and gateway:

-Configure Buildroot
-------------------
+  setenv ipaddr x.x.x.x
+  setenv netmask x.x.x.x
+  setenv gatewayip x.x.x.x

-  $ make ci20_defconfig
+Now you have to set the ip for the TFTP server you are going to load the
+kernel image from, and also the name of the kernel image file (we use
+'uImage' as a filename in this example):

-Build the rootfs
----------------
+  setenv serverip x.x.x.x
+  setenv bootfile uImage

-Note: you will need to have access to the network, since Buildroot will
-download the packages' sources.
+And finally load the kernel image:

-You may now build your rootfs with:
+  tftpboot

-  $ make
+Now you have to extract the generated root filesystem into a USB drive
+or SD-Card. Here you have the instructions to boot from the two of them.
+You have to choose the one your prefer:

-(This may take a while, consider getting yourself a coffee ;-) )
+From USB
+  setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0
+mem=768M@0x30000000 root=/dev/sda1

-How to write the SD card
-========================
+From SD-Card
+  setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0
+mem=768M@0x30000000 root=/dev/mmcblk0p1

-Once the build process is finished you will have an image called
-"sdcard.img" in the output/images/ directory.
-
-Make sure the SD card is not mounted then copy the bootable "sdcard.img" onto
-it with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-
-Insert the SDcard into your ci20, and power it up. Your new system
-should come up now and start a console on the UART HEADER.
-
-see: https://elinux.org/CI20_Hardware#Dedicated_UART_header
+And finally run this command to boot the board:
+  bootm
--- a/board/ci20/uboot-env.txt
+++ b/board/ci20/uboot-env.txt
@@ -1,10 +0,0 @@
-baudrate=115200
-board_mfr=NP
-bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 ip=dhcp
-bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000
-bootdelay=1
-ethargs=env set bootargs ${bootargs}
-loads_echo=1
-stderr=eserial0,eserial4
-stdin=eserial0,eserial4
-stdout=eserial0,eserial4
--- a/board/ci40/genimage.cfg
+++ b/board/ci40/genimage.cfg
@@ -0,0 +1,12 @@
+# Minimal SD card image
+#
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
--- a/board/ci40/post-build.sh
+++ b/board/ci40/post-build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Copy to target
+cp ${BINARIES_DIR}/vmlinux.gz.itb ${TARGET_DIR}/fitImage
--- a/board/ci40/readme.txt
+++ b/board/ci40/readme.txt
@@ -0,0 +1,65 @@
+*********************
+* MIPS Creator CI40 *
+*********************
+
+This document details how to build and run a Buildroot system on the
+MIPS Creator CI40 platform. For more details about the CI40, see
+https://creatordev.io/ci40-iot-hub.html.
+
+How to build
+------------
+
+$ make ci40_defconfig
+$ make
+
+Prepare USB/MMC for boot
+------------------------
+
+On successful build, "sdcard.img" file will be created in 'output/images'
+folder.
+
+Use following command to write image to bootable device
+
+$ sudo dd if=./output/images/sdcard.img of=/dev/<your-microsd-or-usb-device>
+
+Booting from USB/MMC
+--------------------
+
+The boot loader is already present in NOR flash. To boot your newly generated
+Linux and root filesystem, you need to interrupt U-Boot autoboot. Current
+U-Boot is configured with 2 seconds of boot-delay, after expiry of this
+boot-delay timeout U-Boot starts booting the default image. To interrupt
+autoboot, press any key before the boot-delay time expires, U-Boot will
+stop the autoboot process and give a U-Boot prompt. You can now boot to
+your preferred boot method as describe below:
+
+From USB
+  pistachio # run usbboot
+
+From SD-Card
+  pistachio # run mmcboot
+
+Persistent boot command
+-----------------------
+
+To boot automatically to your preferred boot method, use following command to
+make it persistent, for example to automatically boot to usb:
+
+  pistachio # setenv bootcmd run usbboot
+  pistachio # saveenv
+
+Flash new bootloader
+--------------------
+
+The bootloader image will be available in the 'output/images' folder. To flash
+the new bootloader, copy it to the device and use the following command on the
+device:
+
+# flashcp -v u-boot-pistachio_marduk-<version>.img /dev/mtd0
+
+Online docs
+-----------
+
+Mostly for OpenWRT but it is applicable to Buildroot
+https://docs.creatordev.io/ci40/guides/openwrt-platform/#overview
+
--- a/board/embest/riotboard/readme.txt
+++ b/board/embest/riotboard/readme.txt
@@ -0,0 +1,46 @@
+Buildroot for Embest RIoTboard
+==============================
+
+1. Compiling buildroot
+----------------------
+
+make riotboard_defconfig
+make
+
+2. Installing buildroot
+-----------------------
+
+Prepare an SD-card and plug it into your card reader. Write the bootloader to
+your SD-card:
+
+sudo dd if=output/images/u-boot.imx of=/dev/sdX bs=1k seek=1
+
+Create 1 partition on the SD-card using your favourite tool. The
+partition should be big enough to hold your rootfs, for example
+128MiB. Here's an example partition layout:
+
+   Device Boot      Start         End      Blocks   Id  System
+/dev/sdX1            2048      264191      131072   83  Linux
+
+Format the SD-card partition with your favourite filesystem:
+
+sudo mkfs.ext2 /dev/sdX1
+
+Deploy your rootfs to the SD-card:
+
+sudo mkdir /mnt/sdcard/
+sudo mount /dev/sdX1 /mnt/sdcard/
+sudo tar xf output/images/rootfs.tar -C /mnt/sdcard/
+sudo umount /dev/sdX1
+
+3. Running buildroot
+--------------------
+
+Position the board so you can read the label "RIoTboard" on the right side of
+SW1 DIP switches. Configure the SW1 swiches like this:
+
+10100101 (1 means ON position, 0 means OFF position)
+
+Now plug your prepared SD-card in slot J6. Connect a serial console (115200, 8,
+N, 1) to header J18. Connect a 5V/1A power supply to the board and enjoy your
+new toy.
--- a/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf
+++ b/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf
@@ -0,0 +1,6 @@
+default buildroot
+
+label buildroot
+kernel /boot/uImage
+devicetree /boot/imx6dl-riotboard.dtb
+append console=ttymxc1,115200 root=/dev/mmcblk0p1 rw
--- a/board/firefly/firefly-rk3288/extlinux.conf
+++ b/board/firefly/firefly-rk3288/extlinux.conf
@@ -0,0 +1,6 @@
+default firefly-rk3288
+
+label firefly-rk3288
+kernel /boot/uImage
+devicetree /boot/rk3288-firefly.dtb
+append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait
--- a/board/firefly/firefly-rk3288/post-build.sh
+++ b/board/firefly/firefly-rk3288/post-build.sh
@@ -0,0 +1,3 @@
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
--- a/board/firefly/firefly-rk3288/post-image.sh
+++ b/board/firefly/firefly-rk3288/post-image.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/sd-image.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage							\
+	--rootpath "${TARGET_DIR}"		\
+	--tmppath "${GENIMAGE_TMP}"		\
+	--inputpath "${BINARIES_DIR}"	\
+	--outputpath "${BINARIES_DIR}"	\
+	--config "${GENIMAGE_CFG}"
+
+exit $?
--- a/board/firefly/firefly-rk3288/readme.txt
+++ b/board/firefly/firefly-rk3288/readme.txt
@@ -0,0 +1,40 @@
+Firefly RK3288
+
+How to build it
+===============
+
+  $ make firefly_rk3288_defconfig
+
+Then you can edit the build options using
+
+  $ make menuconfig
+
+Compile all and build rootfs image:
+
+  $ make
+
+Result of the build
+-------------------
+
+After building, you should get a tree like this:
+
+  output/images/
+  ├── rk3288-firefly.dtb
+  ├── rootfs.ext2
+  ├── rootfs.ext4 -> rootfs.ext2
+  ├── sdcard.img
+  ├── u-boot-dtb.img
+  ├── u-boot-spl-dtb.bin
+  ├── u-boot-spl-dtb.img
+  └── uImage
+
+Prepare your SDCard
+===================
+
+Buildroot generates a ready-to-use SD card image that you can flash directly to
+the card. The image will be in output/images/sdcard.img.
+You can write this image directly to an SD card device (i.e. /dev/xxx):
+
+  $ dd if=output/images/sdcard.img of=/dev/xxx
+
+Finally, you can insert the SD card to the Firefly RK3288 board and boot it.
--- a/board/firefly/firefly-rk3288/sd-image.cfg
+++ b/board/firefly/firefly-rk3288/sd-image.cfg
@@ -0,0 +1,22 @@
+image sdcard.img {
+  hdimage {
+  }
+
+  partition u-boot-spl-dtb {
+    in-partition-table = "no"
+    image = "u-boot-spl-dtb.img"
+    offset = 32K
+  }
+
+  partition u-boot-dtb {
+    in-partition-table = "no"
+    image = "u-boot-dtb.img"
+    offset = 128K
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+    size = 512M
+  }
+}
--- a/board/freescale/imx31_3stack/linux.fragment
+++ b/board/freescale/imx31_3stack/linux.fragment
@@ -0,0 +1 @@
+# CONFIG_FB_MXS is not set
--- a/board/freescale/imx31_3stack/readme.txt
+++ b/board/freescale/imx31_3stack/readme.txt
@@ -0,0 +1,92 @@
+**************************************
+Freescale i.MX31 PDK development board
+**************************************
+
+This file documents the Buildroot support for the Freescale i.MX31 PDK in "3
+stack" configuration.
+
+The i.MX31 Product Development Kit (or PDK) is Freescale development board [1]
+based on the i.MX31 application processor [2].
+
+For more details on the i.MX31 PDK board, refer to the User's Guide [3].
+
+Build
+=====
+
+First, configure Buildroot for your i.MX31 PDK board:
+
+  make freescale_imx31_3stack_defconfig
+
+Build all components:
+
+  make
+
+You will find in ./output/images/ the following files:
+  - rootfs.cpio
+  - rootfs.cpio.gz
+  - rootfs.tar
+  - zImage
+
+The generated zImage does include the rootfs.
+
+Boot the PDK board
+==================
+
+The i.MX31 PDK contains a RedBoot bootloader in flash, which can be used to
+boot the newly created Buildroot images from the network.
+
+This necessitates to setup a TFTP server first. This setup is explained for
+example in Freescale i.MX31 PDK 1.5 Linux User's Guide [4].
+
+Here is a sample RedBoot configuration, for proper network boot of Buildroot on
+the i.MX31 PDK:
+
+    RedBoot> fconfig -l
+    Run script at boot: true
+    Boot script:
+    .. load -r -b 0x100000 zImage
+    .. exec -c "console=ttymxc0,115200"
+
+    Boot script timeout (1000ms resolution): 2
+    Use BOOTP for network configuration: false
+    Gateway IP address: <your gateway IP address>
+    Local IP address: <your PDK IP address>
+    Local IP address mask: 255.255.255.0
+    Default server IP address: <your TFTP server IP address>
+    Board specifics: 0
+    Console baud rate: 115200
+    Set eth0 network hardware address [MAC]: false
+    GDB connection port: 9000
+    Force console for special debug messages: false
+    Network debug at boot time: false
+
+Adapt those settings to your network configuration by replacing the appropriate
+network addresses where necessary.
+
+You might want to verify that your i.MX31 PDK switches settings are the correct
+ones for UART, power, boot mode, etc. Here is a reference switches
+configuration:
+
+    SW4
+    1   2   3   4   5   6   7  8
+    ON off off off off off off ON
+
+    SW5 SW6 SW7 SW8 SW9 SW10
+     0   1   0   0   0    0
+
+See the i.MX31 PDK Linux Quick Start Guide [5] for more details on the switches
+settings.
+
+Connect a serial terminal set to 115200n8 and power on the i.MX31 PDK board.
+Buildroot will present a login prompt on the serial port.
+
+Enjoy!
+
+References
+==========
+
+[1] http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MX31PDK
+[2] http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MX31
+[3] http://cache.freescale.com/files/32bit/doc/user_guide/pdk15_imx31_Hardware_UG.pdf
+[4] http://cache.freescale.com/files/32bit/doc/support_info/IMX31_PDK15_LINUXDOCS_BUNDLE.zip, pdk15_imx31__Linux_UG.pdf
+[5] http://www.freescale.com/files/32bit/doc/quick_ref_guide/PDK14LINUXQUICKSTART.pdf
--- 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/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
+++ b/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
@@ -22,10 +22,10 @@ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common
 index 93d4c4b..d2e7efd 100644
 --- a/include/configs/mx6sabre_common.h
 +++ b/include/configs/mx6sabre_common.h
-@@ -52,7 +52,7 @@
+@@ -106,7 +106,7 @@
 
 #define CONFIG_MFG_ENV_SETTINGS \
- 	"mfgtool_args=setenv bootargs console=" CONSOLE_DEV ",115200 " \
+ 	"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \
 -		"rdinit=/linuxrc " \
 +		"rdinit=/init " \
 		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
--- a/board/freescale/imx6slevk/readme.txt
+++ b/board/freescale/imx6slevk/readme.txt
@@ -1,14 +0,0 @@
-NXP i.MX6SL EVK board
---------------------
-
-To build a minimal support for this board:
-
-$ make imx6slevk_defconfig
-$ make
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be flashed into the SD card:
-
-$ sudo dd if=output/images/sdcard.img of=/dev/<sd-card-device>; sync
-
-Then insert the SD card into the SD2 slot and boot the board.
--- a/board/freescale/imx6sxsdb/readme.txt
+++ b/board/freescale/imx6sxsdb/readme.txt
@@ -1,14 +0,0 @@
-NXP i.MX6SX SDB board
---------------------
-
-To build a minimal support for this board:
-
-$ make imx6sx-sdb_defconfig
-$ make
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be flashed into the SD card:
-
-$ sudo dd if=output/images/sdcard.img of=/dev/<sd-card-device>; sync
-
-Then insert the SD card into the SD4 boot slot and boot the board.
--- a/board/freescale/imx6ulevk/readme.txt
+++ b/board/freescale/imx6ulevk/readme.txt
@@ -12,18 +12,8 @@ Build

 First, configure Buildroot for your i.MX6UL EVK board:

-In order to to do so there are two supported options:
-
  make freescale_imx6ulevk_defconfig

-if you plan to use NXP provided U-Boot and kernel.
-
-or
-
-  make imx6ulevk_defconfig
-
-if you plan to use mainline U-Boot and mainline kernel.
-
 Build all components:

  make
--- a/board/freescale/mpc8315erdb/linux-4.5.config
+++ b/board/freescale/mpc8315erdb/linux-4.5.config
@@ -0,0 +1,70 @@
+CONFIG_FSL_EMB_PERFMON=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_EMBEDDED=y
+CONFIG_MODULES=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
+CONFIG_PPC_83xx=y
+CONFIG_MPC831x_RDB=y
+CONFIG_MCU_MPC8349EMITX=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+# CONFIG_PCIEASPM is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_SCSI_MQ_DEFAULT=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_ATA=y
+CONFIG_SATA_FSL=y
+CONFIG_NETDEVICES=y
+CONFIG_GIANFAR=y
+CONFIG_REALTEK_PHY=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MPC=y
+CONFIG_SPI=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MPC8XXX=y
+CONFIG_WATCHDOG=y
+CONFIG_8xxx_WDT=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_STORAGE=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_GENERIC=y
+CONFIG_DMADEVICES=y
+CONFIG_FSL_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+CONFIG_EXT4_FS=y
+CONFIG_FANOTIFY=y
+CONFIG_VFAT_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_CRYPTO_DEV_TALITOS=y
--- a/board/freescale/mpc8315erdb/readme.txt
+++ b/board/freescale/mpc8315erdb/readme.txt
@@ -0,0 +1,40 @@
+You'll need to program the files created by buildroot into the flash.
+The fast way is to tftp transfer the files via one of the network interfaces.
+
+Alternatively you can transfer the files via serial console with an Ymodem
+file transfer from your terminal program by using a "loady" command
+from the u-boot prompt instead of the "tftp ..." commands stated below.
+Beware that serial console file transfers are quite slow!
+
+1. Program the kernel to NAND flash
+
+    => tftp $loadaddr uImage
+    => nand erase 0x100000 0x1e0000
+    => nand write $loadaddr 0x100000 0x1e0000
+
+2. Program the DTB to NAND flash
+
+    => tftp $loadaddr mpc8315erdb.dtb
+    => nand erase 0x2e0000 0x20000
+    => nand write $loadaddr 0x2e0000 0x20000
+
+3. Program the root filesystem to NAND flash
+
+    => tftp $loadaddr rootfs.jffs2
+    => nand erase 0x400000 0x1c00000
+    => nand write $loadaddr 0x400000 $filesize
+
+4. Booting your new system
+
+    => setenv nandboot 'setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=$consoledev,$baudrate;nand read $fdtaddr 0x2e0000 0x20000;nand read $loadaddr 0x100000 0x1e0000;bootm $loadaddr - $fdtaddr'
+
+    If you want to set this boot option as default:
+
+    => setenv bootcmd 'run nandboot'
+    => saveenv
+
+    ...or for a single boot:
+
+    => run nandboot
+
+    You can login with user "root".
--- a/board/freescale/p1010rdb/linux-4.1.config
+++ b/board/freescale/p1010rdb/linux-4.1.config
@@ -0,0 +1,70 @@
+CONFIG_PPC_85xx=y
+CONFIG_PHYS_64BIT=y
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_EXPERT=y
+CONFIG_MODULES=y
+CONFIG_P1010_RDB=y
+CONFIG_HIGHMEM=y
+CONFIG_SWIOTLB=y
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_RAPIDIO=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_DEVTMPFS=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_FTL=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_ATA=y
+CONFIG_SATA_FSL=y
+CONFIG_NETDEVICES=y
+CONFIG_GIANFAR=y
+CONFIG_VITESSE_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_NVRAM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MPC=y
+CONFIG_SPI=y
+CONFIG_SPI_FSL_SPI=y
+CONFIG_SPI_FSL_ESPI=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_STORAGE=y
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_ESDHC=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_DMADEVICES=y
+CONFIG_FSL_DMA=y
+CONFIG_EXT4_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_SQUASHFS=y
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
--- a/board/freescale/p1010rdb/readme.txt
+++ b/board/freescale/p1010rdb/readme.txt
@@ -0,0 +1,40 @@
+You'll need to program the files created by buildroot into the flash.
+The fast way is to tftp transfer the files via one of the network interfaces.
+
+Alternatively you can transfer the files via serial console with an Ymodem
+file transfer from your terminal program by using a "loady" command
+from the u-boot prompt instead of the "tftp ..." commands stated below.
+Beware that serial console file transfers are quite slow!
+
+1. Program the DTB to NOR flash
+
+    => tftp $loadaddr p1010rdb-pa.dtb
+    => erase 0xee000000 +$filesize
+    => cp.b $loadaddr 0xee000000 $filesize
+
+2. Program the kernel to NOR flash
+
+    => tftp $loadaddr uImage
+    => erase 0xee080000 +$filesize
+    => cp.b $loadaddr 0xee080000 $filesize
+
+3. Program the root filesystem to NOR flash
+
+    => tftp $loadaddr rootfs.jffs2
+    => erase 0xee800000 0xeff5ffff
+    => cp.b $loadaddr 0xee800000 $filesize
+
+4. Booting your new system
+
+    => setenv norboot 'setenv bootargs root=/dev/mtdblock2 rootfstype=jffs2 console=$consoledev,$baudrate;bootm 0xee080000 - 0xee000000'
+
+    If you want to set this boot option as default:
+
+    => setenv bootcmd 'run norboot'
+    => saveenv
+
+    ...or for a single boot:
+
+    => run norboot
+
+    You can login with user "root".
--- a/board/friendlyarm/nanopi-a64/boot.cmd
+++ b/board/friendlyarm/nanopi-a64/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-a64-nanopi-a64.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/friendlyarm/nanopi-a64/genimage.cfg
+++ b/board/friendlyarm/nanopi-a64/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-nanopi-a64.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/friendlyarm/nanopi-a64/readme.txt
+++ b/board/friendlyarm/nanopi-a64/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Nanopi A64. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Nanopi A64 link:
-http://nanopi.io/nanopi-a64.html
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+Nanopi+A64
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make friendlyarm_nanopi_a64_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Nanopi A64 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/friendlyarm/nanopi-neo2/boot.cmd
+++ b/board/friendlyarm/nanopi-neo2/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo2.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/friendlyarm/nanopi-neo2/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h5-nanopi-neo2.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/friendlyarm/nanopi-neo2/readme.txt
+++ b/board/friendlyarm/nanopi-neo2/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Nanopi NEO2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Nanopi NEO2 link:
-http://nanopi.io/nanopi-neo2.html
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+NanoPi+NEO2
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make friendlyarm_nanopi_neo2_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Nanopi NEO2 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/gdb/bfin-bf512/linux-4.6.config
+++ b/board/gdb/bfin-bf512/linux-4.6.config
--- a/board/lego/ev3/genimage.cfg
+++ b/board/lego/ev3/genimage.cfg
@@ -16,17 +16,17 @@ image flash.bin {
 	flashtype = "nor-16M-256"
 	partition uboot {
 		image = "u-boot.bin"
-		size = 256K
+		size = 320K
 	}
 	partition uimage {
 		image = "uImage.da850-lego-ev3"
-		size = 4M
+		size = 3M
 		offset = 0x50000
 	}
 	partition rootfs {
 		image = "rootfs.squashfs"
-		size = 10M
-		offset = 0x450000
+		size = 9600K
+		offset = 0x350000
 	}
 }

--- a/board/lego/ev3/linux.fragment
+++ b/board/lego/ev3/linux.fragment
@@ -54,9 +54,3 @@ CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_DRM=y
-CONFIG_DRM_TILCDC=n
-CONFIG_DRM_DUMB_VGA_DAC=n
-CONFIG_DRM_TINYDRM=y
-CONFIG_TINYDRM_ST7586=y
-CONFIG_FB_DA8XX=n
--- a/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch
+++ b/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch
@@ -0,0 +1,56 @@
+From 8a81ff173c5c9a0ab1df84fab17971dbcce8490a Mon Sep 17 00:00:00 2001
+From: David Lechner <david@lechnology.com>
+Date: Tue, 7 Feb 2017 13:22:07 -0600
+Subject: ARM: da850-lego-ev3: Add device tree node for A/DC
+
+This adds a node for the TI ADS7957 analog/digital converter on LEGO
+MINDSTORMS EV3 as well as a regulator node that is used by the A/DC node.
+
+Signed-off-by: David Lechner <david@lechnology.com>
+Signed-off-by: Sekhar Nori <nsekhar@ti.com>
+---
+ arch/arm/boot/dts/da850-lego-ev3.dts | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
+index 112ec92..0309537 100644
+--- a/arch/arm/boot/dts/da850-lego-ev3.dts
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
+@@ -139,6 +139,19 @@
+ 		enable-active-high;
+ 		regulator-boot-on;
+ 	};
+
+	/*
+	 * This is a simple voltage divider on VCC5V to provide a 2.5V
+	 * reference signal to the ADC.
+	 */
+	adc_ref: regulator2 {
+		compatible = "regulator-fixed";
+		regulator-name = "adc ref";
+		regulator-min-microvolt = <2500000>;
+		regulator-max-microvolt = <2500000>;
+		regulator-boot-on;
+		vin-supply = <&vcc5v>;
+	};
+ };
+ 
+ &pmx_core {
+@@ -293,6 +306,14 @@
+ 			};
+ 		};
+ 	};
+
+	adc: adc@3 {
+		compatible = "ti,ads7957";
+		reg = <3>;
+		#io-channel-cells = <1>;
+		spi-max-frequency = <10000000>;
+		vref-supply = <&adc_ref>;
+	};
+ };
+ 
+ &gpio {
+-- 
+cgit v1.1
+
--- a/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch
+++ b/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch
@@ -0,0 +1,85 @@
+From 7723d70bebd749ef24fef19db52d827c7fd7f858 Mon Sep 17 00:00:00 2001
+From: David Lechner <david@lechnology.com>
+Date: Tue, 7 Feb 2017 13:22:09 -0600
+Subject: ARM: da850-lego-ev3: Add device tree node for sound
+
+This adds a device tree node for sound on LEGO MINDSTORMS EV3. The EV3
+uses one of the SoC PWMs connected to an amplifier to create sound from
+a speaker.
+
+The PWM is passed through a low-pass filter, so it is actually possible
+to do PCM playback, but there is no existing driver, so just using
+pwm-beeper for now, since it is also a compatible mode of operation.
+
+Signed-off-by: David Lechner <david@lechnology.com>
+Signed-off-by: Sekhar Nori <nsekhar@ti.com>
+---
+ arch/arm/boot/dts/da850-lego-ev3.dts | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
+index 0309537..c20580a 100644
+--- a/arch/arm/boot/dts/da850-lego-ev3.dts
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
+@@ -123,6 +123,14 @@
+ 		pinctrl-0 = <&system_power_pin>;
+ 	};
+ 
+	sound {
+		compatible = "pwm-beeper";
+		pinctrl-names = "default";
+		pinctrl-0 = <&ehrpwm0b_pins>;
+		pwms = <&ehrpwm0 1 1000000 0>;
+		amp-supply = <&amp>;
+	};
+
+ 	/*
+ 	 * This is a 5V current limiting regulator that is shared by USB,
+ 	 * the sensor (input) ports, the motor (output) ports and the A/DC.
+@@ -152,6 +160,18 @@
+ 		regulator-boot-on;
+ 		vin-supply = <&vcc5v>;
+ 	};
+
+	/*
+	 * This is the amplifier for the speaker.
+	 */
+	amp: regulator3 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&amp_pins>;
+		compatible = "regulator-fixed";
+		regulator-name = "amp";
+		gpio = <&gpio 111 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+ };
+ 
+ &pmx_core {
+@@ -208,6 +228,13 @@
+ 			0x4c 0x00008000 0x0000f000
+ 		>;
+ 	};
+
+	amp_pins: pinmux_amp_pins {
+		pinctrl-single,bits = <
+			/* GP6[15] */
+			0x34 0x00000008 0x0000000f
+		>;
+	};
+ };
+ 
+ &pinconf {
+@@ -316,6 +343,10 @@
+ 	};
+ };
+ 
+&ehrpwm0 {
+	status = "okay";
+};
+
+ &gpio {
+ 	status = "okay";
+ };
+-- 
+cgit v1.1
+
--- a/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch
+++ b/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch
@@ -1,31 +0,0 @@
-From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001
-From: David Lechner <david@lechnology.com>
-Date: Sun, 19 Nov 2017 19:54:32 -0600
-Subject: [PATCH] configs: legoev3: increase flash image sizes
-
-This increases the kernel image to 4M and the rootfs image to 10M.
-
-It is getting hard to get a kernel image to fit in 3M and the rootfs image
-size now matches the filesyssize variable.
-
-Signed-off-by: David Lechner <david@lechnology.com>
---
- include/configs/legoev3.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
-index 79fa3c4..2eeaf85 100644
--- a/include/configs/legoev3.h
-+++ b/include/configs/legoev3.h
-@@ -204,7 +204,7 @@
- 	"mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
- 	"mmcboot=bootm ${loadaddr}\0" \
- 	"flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
-	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \
-+	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \
- 	"loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
- 	"loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
- 	"bootscript=source ${bootscraddr}\0" \
-- 
-2.7.4
-
--- a/board/minnowboard/linux.config
+++ b/board/minnowboard/linux.config
@@ -21,7 +21,6 @@ CONFIG_SATA_AHCI=y
 CONFIG_ATA_PIIX=y
 CONFIG_NETDEVICES=y
 CONFIG_R8169=y
-CONFIG_IGB=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
@@ -57,4 +56,3 @@ CONFIG_MMC_SDHCI_PCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_PWM=y
 CONFIG_EXT4_FS=y
-CONFIG_UNWINDER_FRAME_POINTER=y
--- a/board/olimex/a64-olinuxino/boot.cmd
+++ b/board/olimex/a64-olinuxino/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-a64-olinuxino.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/olimex/a64-olinuxino/genimage.cfg
+++ b/board/olimex/a64-olinuxino/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-olinuxino.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/olimex/a64-olinuxino/readme.txt
+++ b/board/olimex/a64-olinuxino/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the A64-OLinuXino. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-A64-OLinuXino link:
-https://www.olimex.com/Products/OLinuXino/A64/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Olimex+A64-Olinuxino
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make olimex_a64_olinuxino_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your A64-OLinuXino and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/orangepi/orangepi-lite/boot.cmd
+++ b/board/orangepi/orangepi-lite/boot.cmd
@@ -1,8 +0,0 @@
-setenv fdt_high ffffffff
-
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-lite.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-lite/genimage.cfg
+++ b/board/orangepi/orangepi-lite/genimage.cfg
@@ -1,36 +0,0 @@
-# Minimal SD card image for the OrangePi Lite
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-orangepi-lite.dtb",
-			"boot.scr"
-		}
-	}
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/orangepi/orangepi-lite/linux-extras.config
+++ b/board/orangepi/orangepi-lite/linux-extras.config
@@ -1,8 +0,0 @@
-# wireless core
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_CFG80211_WEXT=y
-
-# wireless drivers
-CONFIG_WLAN=y
--- a/board/orangepi/orangepi-lite/readme.txt
+++ b/board/orangepi/orangepi-lite/readme.txt
@@ -1,29 +0,0 @@
-OrangePi Lite
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the OrangePi Lite. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make orangepi_lite_defconfig
-
-Compile everything and build the SD card image:
-
-    $ make
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
--- a/board/orangepi/orangepi-one/post-build.sh
+++ b/board/orangepi/orangepi-one/post-build.sh
@@ -0,0 +1 @@
+../post-build.sh
--- a/board/orangepi/orangepi-one/post-image.sh
+++ b/board/orangepi/orangepi-one/post-image.sh
@@ -0,0 +1 @@
+../post-image.sh
--- a/board/orangepi/orangepi-pc-plus/boot.cmd
+++ b/board/orangepi/orangepi-pc-plus/boot.cmd
@@ -1,8 +0,0 @@
-setenv fdt_high ffffffff
-
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-pc-plus/genimage.cfg
+++ b/board/orangepi/orangepi-pc-plus/genimage.cfg
@@ -1,36 +0,0 @@
-# Minimal SD card image for the OrangePi PC Plus
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-orangepi-pc-plus.dtb",
-			"boot.scr"
-		}
-	}
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/orangepi/orangepi-pc-plus/linux-extras.config
+++ b/board/orangepi/orangepi-pc-plus/linux-extras.config
@@ -1,8 +0,0 @@
-# wireless core
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_CFG80211_WEXT=y
-
-# wireless drivers
-CONFIG_WLAN=y
--- a/board/orangepi/orangepi-pc-plus/readme.txt
+++ b/board/orangepi/orangepi-pc-plus/readme.txt
@@ -1,29 +0,0 @@
-OrangePi PC Plus
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the OrangePi PC Plus. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make orangepi_pc_plus_defconfig
-
-Compile everything and build the SD card image:
-
-    $ make
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
--- a/board/orangepi/orangepi-pc/post-build.sh
+++ b/board/orangepi/orangepi-pc/post-build.sh
@@ -0,0 +1 @@
+../post-build.sh
--- a/board/orangepi/orangepi-pc/post-image.sh
+++ b/board/orangepi/orangepi-pc/post-image.sh
@@ -0,0 +1 @@
+../post-image.sh
--- a/board/orangepi/orangepi-pc2/boot.cmd
+++ b/board/orangepi/orangepi-pc2/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-pc2.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-pc2/genimage.cfg
+++ b/board/orangepi/orangepi-pc2/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h5-orangepi-pc2.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/orangepi/orangepi-pc2/readme.txt
+++ b/board/orangepi/orangepi-pc2/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi PC2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi PC2 link:
-http://www.orangepi.org/orangepipc2/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+PC2
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make orangepi_pc2_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Orangepi PC2 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/orangepi/orangepi-prime/boot.cmd
+++ b/board/orangepi/orangepi-prime/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-prime.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-prime/genimage.cfg
+++ b/board/orangepi/orangepi-prime/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h5-orangepi-prime.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/orangepi/orangepi-prime/readme.txt
+++ b/board/orangepi/orangepi-prime/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi Prime. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi Prime link:
-http://www.orangepi.org/OrangePiPrime/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Prime
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make orangepi_prime_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Orangepi Prime and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/orangepi/orangepi-win/boot.cmd
+++ b/board/orangepi/orangepi-win/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-a64-orangepi-win.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-win/genimage.cfg
+++ b/board/orangepi/orangepi-win/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-orangepi-win.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/orangepi/orangepi-win/readme.txt
+++ b/board/orangepi/orangepi-win/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi Win/Win Plus. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi Win/Win Plus link:
-http://www.orangepi.org/OrangePiWin_WinPlus/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Win
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make orangepi_win_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Orangepi Win/Win Plus and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/orangepi/orangepi-zero-plus2/boot.cmd
+++ b/board/orangepi/orangepi-zero-plus2/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-zero-plus2/genimage.cfg
+++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h5-orangepi-zero-plus2.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
+++ b/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
@@ -1,30 +0,0 @@
-From f88e9301948173dd35afad4a6939092c7f269aed Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <geomatsi@gmail.com>
-Date: Fri, 3 Nov 2017 22:58:54 +0300
-Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: fix sdcard detect
-
-The sdcard detect pin on orange-pi-zero-plus2 is pulled up.
-Fix cd-gpio description to enable sdcard detect.
-
-Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
- arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-index b6b7a56..a42fd79 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
-@@ -71,7 +71,7 @@
- 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
- 	vmmc-supply = <&reg_vcc3v3>;
- 	bus-width = <4>;
-	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-+	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
- 	status = "okay";
- };
- 
-- 
-1.9.1
-
--- a/board/orangepi/orangepi-zero-plus2/readme.txt
+++ b/board/orangepi/orangepi-zero-plus2/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Orangepi Zero Plus2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Orangepi Zero Plus2 link:
-http://www.orangepi.org/OrangePiZeroPlus2/
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make orangepi_zero_plus2_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Orangepi Zero Plus2 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/orangepi/orangepi-zero/post-build.sh
+++ b/board/orangepi/orangepi-zero/post-build.sh
@@ -0,0 +1 @@
+../post-build.sh
--- a/board/orangepi/orangepi-zero/post-image.sh
+++ b/board/orangepi/orangepi-zero/post-image.sh
@@ -0,0 +1 @@
+../post-image.sh
--- a/board/orangepi/post-build.sh
+++ b/board/orangepi/post-build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# post-build.sh for OrangePi taken from CubieBoard's post-build.sh
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOOT_CMD=$BOARD_DIR/boot.cmd
+BOOT_CMD_H=$BINARIES_DIR/boot.scr
+
+# U-Boot script
+$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
--- a/board/orangepi/post-image.sh
+++ b/board/orangepi/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                               \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/pc/post-build.sh
+++ b/board/pc/post-build.sh
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-BOARD_DIR=$(dirname "$0")
-
-# Detect boot strategy, EFI or BIOS
-if [ -f "$BINARIES_DIR/efi-part/startup.nsh" ]; then
-    cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg"
-else
-    cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"
-
-    # Copy grub 1st stage to binaries, required for genimage
-    cp -f "$HOST_DIR/lib/grub/i387-pc/boot.img" "$BINARIES_DIR"
-fi
--- a/board/pc/post-image.sh
+++ b/board/pc/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+# Detect boot strategy, EFI or BIOS
+if [ -f ${BINARIES_DIR}/efi-part/startup.nsh ]; then
+  cp -f ${BOARD_DIR}/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+else
+  cp -f ${BOARD_DIR}/grub-bios.cfg ${TARGET_DIR}/boot/grub/grub.cfg
+  # Copy grub 1st stage to binaries, required for genimage
+  cp -f ${HOST_DIR}/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
+fi
+
+exit $?
--- a/board/pine64/pine64/boot.cmd
+++ b/board/pine64/pine64/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-a64-pine64.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/pine64/pine64/genimage.cfg
+++ b/board/pine64/pine64/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-a64-pine64.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/pine64/pine64/readme.txt
+++ b/board/pine64/pine64/readme.txt
@@ -1,38 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Pine64. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Pine64 link:
-https://www.pine64.org/?page_id=1194
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Pine64
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make pine64_defconfig
-
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Pine64 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/pine64/sopine/boot.cmd
+++ b/board/pine64/sopine/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-a64-sopine-baseboard.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/Show More
+++ b/Show More