Update for 2017.05.2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
tcpdump: security bump to 4.9.1
2017-07-27 08:16:52 +02:00 · 2017-07-26 22:51:48 +02:00 · 2017-07-26 22:51:01 +02:00 · 2017-07-25 23:56:56 +02:00 · 2017-07-25 23:56:02 +02:00 · 2017-07-25 23:55:05 +02:00
3649 changed files with 79160 additions and 43741 deletions
--- a/.flake8
+++ b/.flake8
@@ -1,2 +0,0 @@
-[flake8]
-max-line-length=132
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ image: buildroot/base

 .defconfig_script: &defconfig_script
    - echo 'Configure Buildroot'
-    - make ${CI_JOB_NAME}
+    - make ${CI_BUILD_NAME}
    - echo 'Build buildroot'
    - |
        make > >(tee build.log |grep '>>>') 2>&1 || {
@@ -23,13 +23,6 @@ check-gitlab-ci.yml:
        - make .gitlab-ci.yml
        - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml

-check-DEVELOPERS:
-    # get-developers should print just "No action specified"; if it prints
-    # anything else, it's a parse error.
-    # The initial ! is removed by YAML so we need to quote it.
-    script:
-        - "! utils/get-developers | grep -v 'No action specified'"
-
 .defconfig: &defconfig
    # Running the defconfigs for every push is too much, so limit to
    # explicit triggers through the API.
@@ -46,18 +39,6 @@ check-DEVELOPERS:
            - output/build/build-time.log
            - output/build/packages-file-list.txt

-.runtime_test: &runtime_test
-    # 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
-    # elastic runners.
-    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
-    artifacts:
-        when: always
-        expire_in: 2 weeks
-        paths:
-            - test-output/*.log
-            - test-output/*/images/*
 acmesystems_aria_g25_128mb_defconfig: *defconfig
 acmesystems_aria_g25_256mb_defconfig: *defconfig
 acmesystems_arietta_g25_128mb_defconfig: *defconfig
@@ -68,6 +49,7 @@ arm_juno_defconfig: *defconfig
 armadeus_apf27_defconfig: *defconfig
 armadeus_apf28_defconfig: *defconfig
 armadeus_apf51_defconfig: *defconfig
+armadeus_apf9328_defconfig: *defconfig
 at91sam9260eknf_defconfig: *defconfig
 at91sam9g20dfc_defconfig: *defconfig
 at91sam9g45m10ek_defconfig: *defconfig
@@ -76,7 +58,6 @@ at91sam9x5ek_defconfig: *defconfig
 at91sam9x5ek_dev_defconfig: *defconfig
 at91sam9x5ek_mmc_defconfig: *defconfig
 at91sam9x5ek_mmc_dev_defconfig: *defconfig
-atmel_sama5d27_som1_ek_mmc_dev_defconfig: *defconfig
 atmel_sama5d2_xplained_mmc_defconfig: *defconfig
 atmel_sama5d2_xplained_mmc_dev_defconfig: *defconfig
 atmel_sama5d3_xplained_defconfig: *defconfig
@@ -88,8 +69,6 @@ atmel_sama5d4_xplained_defconfig: *defconfig
 atmel_sama5d4_xplained_dev_defconfig: *defconfig
 atmel_sama5d4_xplained_mmc_defconfig: *defconfig
 atmel_sama5d4_xplained_mmc_dev_defconfig: *defconfig
-bananapi_m1_defconfig: *defconfig
-bananapi_m2_plus_defconfig: *defconfig
 bananapro_defconfig: *defconfig
 beagleboardx15_defconfig: *defconfig
 beaglebone_defconfig: *defconfig
@@ -99,11 +78,6 @@ ci20_defconfig: *defconfig
 ci40_defconfig: *defconfig
 csky_gx6605s_defconfig: *defconfig
 cubieboard2_defconfig: *defconfig
-engicam_imx6qdl_icore_defconfig: *defconfig
-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
@@ -123,11 +97,8 @@ gdb_bfin_bf512_defconfig: *defconfig
 grinn_chiliboard_defconfig: *defconfig
 grinn_liteboard_defconfig: *defconfig
 imx23evk_defconfig: *defconfig
-imx6-sabreauto_defconfig: *defconfig
-imx6-sabresd_defconfig: *defconfig
-imx6-sabresd_qt5_defconfig: *defconfig
+imx6q-sabresd_defconfig: *defconfig
 imx6ulpico_defconfig: *defconfig
-imx7dpico_defconfig: *defconfig
 lego_ev3_defconfig: *defconfig
 linksprite_pcduino_defconfig: *defconfig
 minnowboard_max-graphical_defconfig: *defconfig
@@ -138,15 +109,12 @@ mx53loco_defconfig: *defconfig
 mx6cubox_defconfig: *defconfig
 mx6sx_udoo_neo_defconfig: *defconfig
 mx6udoo_defconfig: *defconfig
-nanopi_m1_defconfig: *defconfig
-nanopi_m1_plus_defconfig: *defconfig
 nanopi_neo_defconfig: *defconfig
 nexbox_a95x_defconfig: *defconfig
 nitrogen6sx_defconfig: *defconfig
 nitrogen6x_defconfig: *defconfig
 nitrogen7_defconfig: *defconfig
 odroidc2_defconfig: *defconfig
-olimex_a13_olinuxino_defconfig: *defconfig
 olimex_a20_olinuxino_lime2_defconfig: *defconfig
 olimex_a20_olinuxino_lime_defconfig: *defconfig
 olimex_a20_olinuxino_lime_mali_defconfig: *defconfig
@@ -155,8 +123,6 @@ olimex_imx233_olinuxino_defconfig: *defconfig
 openblocks_a6_defconfig: *defconfig
 orangepi_one_defconfig: *defconfig
 orangepi_pc_defconfig: *defconfig
-orangepi_plus_defconfig: *defconfig
-orangepi_zero_defconfig: *defconfig
 pandaboard_defconfig: *defconfig
 pc_x86_64_bios_defconfig: *defconfig
 pc_x86_64_efi_defconfig: *defconfig
@@ -179,7 +145,6 @@ qemu_mips64r6el_malta_defconfig: *defconfig
 qemu_nios2_10m50_defconfig: *defconfig
 qemu_or1k_defconfig: *defconfig
 qemu_ppc64_pseries_defconfig: *defconfig
-qemu_ppc64le_pseries_defconfig: *defconfig
 qemu_ppc_g3beige_defconfig: *defconfig
 qemu_ppc_mpc8544ds_defconfig: *defconfig
 qemu_ppc_virtex_ml507_defconfig: *defconfig
@@ -195,7 +160,6 @@ raspberrypi0_defconfig: *defconfig
 raspberrypi2_defconfig: *defconfig
 raspberrypi3_64_defconfig: *defconfig
 raspberrypi3_defconfig: *defconfig
-raspberrypi3_qt5we_defconfig: *defconfig
 raspberrypi_defconfig: *defconfig
 riotboard_defconfig: *defconfig
 roseapplepi_defconfig: *defconfig
@@ -206,7 +170,6 @@ snps_arc700_axs101_defconfig: *defconfig
 snps_archs38_axs103_defconfig: *defconfig
 snps_archs38_haps_defconfig: *defconfig
 snps_archs38_vdk_defconfig: *defconfig
-socrates_cyclone5_defconfig: *defconfig
 stm32f429_disco_defconfig: *defconfig
 stm32f469_disco_defconfig: *defconfig
 telit_evk_pro3_defconfig: *defconfig
@@ -214,7 +177,6 @@ toradex_apalis_imx6_defconfig: *defconfig
 ts4800_defconfig: *defconfig
 ts4900_defconfig: *defconfig
 ts5x00_defconfig: *defconfig
-ts7680_defconfig: *defconfig
 wandboard_defconfig: *defconfig
 warp7_defconfig: *defconfig
 warpboard_defconfig: *defconfig
@@ -222,44 +184,3 @@ zynq_microzed_defconfig: *defconfig
 zynq_zc706_defconfig: *defconfig
 zynq_zed_defconfig: *defconfig
 zynq_zybo_defconfig: *defconfig
-tests.core.test_post_scripts.TestPostScripts: *runtime_test
-tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test
-tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test
-tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: *runtime_test
-tests.core.test_timezone.TestNoTimezone: *runtime_test
-tests.fs.test_ext.TestExt2: *runtime_test
-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.TestIso9660Grub2Internal: *runtime_test
-tests.fs.test_iso9660.TestIso9660SyslinuxExternal: *runtime_test
-tests.fs.test_iso9660.TestIso9660SyslinuxInternal: *runtime_test
-tests.fs.test_jffs2.TestJffs2: *runtime_test
-tests.fs.test_squashfs.TestSquashfs: *runtime_test
-tests.fs.test_ubi.TestUbi: *runtime_test
-tests.fs.test_yaffs2.TestYaffs2: *runtime_test
-tests.init.test_busybox.TestInitSystemBusyboxRo: *runtime_test
-tests.init.test_busybox.TestInitSystemBusyboxRoNet: *runtime_test
-tests.init.test_busybox.TestInitSystemBusyboxRw: *runtime_test
-tests.init.test_busybox.TestInitSystemBusyboxRwNet: *runtime_test
-tests.init.test_none.TestInitSystemNone: *runtime_test
-tests.init.test_systemd.TestInitSystemSystemdRoFull: *runtime_test
-tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: *runtime_test
-tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: *runtime_test
-tests.init.test_systemd.TestInitSystemSystemdRwFull: *runtime_test
-tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: *runtime_test
-tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: *runtime_test
-tests.package.test_dropbear.TestDropbear: *runtime_test
-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.toolchain.test_external.TestExternalToolchainBuildrootMusl: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainCCache: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainCtngMusl: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainLinaroArm: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: *runtime_test
-tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: *runtime_test
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -8,7 +8,7 @@ image: buildroot/base

 .defconfig_script: &defconfig_script
    - echo 'Configure Buildroot'
-    - make ${CI_JOB_NAME}
+    - make ${CI_BUILD_NAME}
    - echo 'Build buildroot'
    - |
        make > >(tee build.log |grep '>>>') 2>&1 || {
@@ -23,13 +23,6 @@ check-gitlab-ci.yml:
        - make .gitlab-ci.yml
        - diff -u .gitlab-ci.yml.orig .gitlab-ci.yml

-check-DEVELOPERS:
-    # get-developers should print just "No action specified"; if it prints
-    # anything else, it's a parse error.
-    # The initial ! is removed by YAML so we need to quote it.
-    script:
-        - "! utils/get-developers | grep -v 'No action specified'"
-
 .defconfig: &defconfig
    # Running the defconfigs for every push is too much, so limit to
    # explicit triggers through the API.
@@ -46,15 +39,3 @@ check-DEVELOPERS:
            - output/build/build-time.log
            - output/build/packages-file-list.txt

-.runtime_test: &runtime_test
-    # 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
-    # elastic runners.
-    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
-    artifacts:
-        when: always
-        expire_in: 2 weeks
-        paths:
-            - test-output/*.log
-            - test-output/*/images/*
--- a/564
+++ b/564
@@ -1,417 +1,3 @@
-2017.11.1, Released December 31th, 2017
-
-	Important / security related fixes.
-
-	Updated/fixed packages: asterisk, checkpolicy, dhcp, flann,
-	gdb, glibc, heimdal, kodi-pvr-mediaportal-tvserver,
-	kodi-pvr-stalker, libcue, libopenssl, libpqxx, libsoxr,
-	linknx, linux-tools, lldpd, ltp-testsuite, mariadb, mfgtools,
-	nodejs, nut, pulseaudio, python-cffi, qemu, rsync, tor, uboot,
-	uboot-tools, vlc, webkitgtk, weston, wireguard, wireshark,
-	xenomai, xfsprogs
-
-2017.11, Released November 30, 2017
-
-	Fixes all over the tree.
-
-	Toolchain: Use github mirror for Glibc.
-
-	Defconfigs: Correct boot.cmd for bananapi-m1.
-
-	Makefiles: Workaround include order issues for certain make
-	versions by explicitly sorting the result of wildcard where it
-	matters.
-
-	Download: Ensure subversion runs in non-interactive mode.
-
-	Updated/fixed packages: asterisk, boost, chrony, dovecot,
-	dvb-apps, exim, feh, freerdp, fwup, google-breakpad, jose,
-	kvm-unit-test, lftp, libcurl, libevent, libfastjson, libpjsip,
-	libupnp, linphone, localedef, lttng-tools, mp4v2, mtools,
-	ndisc6, oracle-mysql, parted, pdbg, qt, qt5connectivity,
-	qt5declarative, qt5webkit, rauc, runc, samba4, shairport-sync,
-	systemd-bootchart, webkitgtk, wireguard, xlib_libXcursor,
-	xlib_libXfont, xlib_libXfont2,
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	10501: host-localedef fails to compile on Ubuntu 17.10
-	10506: Changed kernel image type (e.g. zImage to uImage)...
-
-2017.11-rc2, Released November 13th, 2017
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: collectd, ffmpeg, freerdp,
-	go-bootstrap, imagemagick, jimtcl, libpjsip, libplist, libuv,
-	mesa3d, nodejs, ntp, openjpeg, postgresql, python-numpy, ruby,
-	snmp++, usb_modeswitch, util-linux, vboot-utils, webkitgtk,
-	wireshark, wpa_supplicant, xapp_xdriinfo
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
-	#10491: Cannot output security warning when compiled with buildroot..
-
-2017.11-rc1, Released November 6th, 2017
-
-	Fixes all over the tree and new features.
-
-	Openssl is now a virtual package, which may be provided by
-	OpenSSL (now renamed to libopenssl) or LibreSSL.
-
-	libssh2: there is now an explicit choice of the backend to use
-	(mbedtls, gnutls or openssl). Previously, the choice was implicit
-	based on the TLS library that was selected. Now, it is possible to
-	choose the backend, which is important if several TLS libraries are
-	selected.
-
-	netsnmp: all MIB files are now installed, making the target filesystem a
-	bit bigger than before. To remove unneeded MIBS, you should use a
-	post-build script.
-
-	Toolchain: Linaro toolchains updated to 2017.08, ARC toolchain
-	updated to 2017.09, Glibc updated to 2.26, Glibc support for
-	ARCv2. The toolchain wrapper now handles SOURCE_DATE_EPOCH for
-	older (pre-gcc7.x) toolchains for BR2_REPRODUCIBLE.
-
-	New defconfigs: Atmel SAM45D27, Bananapi M1 and M2 Plus,
-	Engicam i.CoreM6 Qt5 configuration, i.MX6 sabreauto (mainline
-	kernel/u-boot), i.MX6Q sabresd Qt5 configuration, i.MX7d-pico,
-	QEMU ppc64le, Raspberry pi3 Qt5 webengine configuration,
-	Technologic TS-7680.
-
-	New packages: asterisk, azmq, bcg729, boinc, dahdi-linux,
-	dahdi-tools, freeswitch-mod-bcg729, fscryptctl, libb64,
-	libpri, libss7, lua-basexx, lua-compat53, lua-cqueues,
-	lua-curl, lua-datafile, lua-fifo, lua-httpd,
-	lua-lpeg-patterns, lua-markdown, lua-sailor, lua-value,
-	luksmeta, minetest, minetest-game, pdmenu, prosody,
-	python-aiocoap, python-automat, python-ibmiotf,
-	python-iso8601, python-m2r, python-simplesqlite,
-	python-websockets, python-xmltodict, qt5wayland, qt5webengine,
-	restorecond, selinux-python, semodule-utils, uhubctl,
-	wireguard, wsapi-fcgi, wsapi-xavante
-
-	Removed packages: aiccu, rfkill, sepolgen
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10281: lsblk does not compile for util-linux
-	#10336: lttng compilation fails : linking error
-	#10351: glibc missing in rootfs
-	#10356: nfs-utils missing header
-	#10361: python3 python-config script generates invalid includes
-	#10366: dropbear download url has changed
-	#10391: WiringPi retrieves wrong (old) version
-	#10406: Beaglebone black: Buggy SGX driver version, swapped...
-	#10426: uboot-tools' fw_setenv does not update the redundant...
-	#10451: libpcap 1.8.x and 1.7x does not compile on PPC
-
-2017.08.2, Released November 28th, 2017
-
-	Important / security related fixes.
-
-	Qt: 5.6 version updated to 5.6.3.
-
-	Reproducible: Do not override SOURCE_DATE_EPOCH if already set
-	in the environment.
-
-	Makefiles: Workaround include order issues for certain make
-	versions by explicitly sorting the result of wildcard where it
-	matters.
-
-	Updated/fixed packages: apr, apr-util, arqp-standalone,
-	azure-iot-sdk-c, collectd, dvb-apps, ffmpeg, go-bootstrap,
-	google-breakpad, gstreamer, imagemagick, irssi, jimtcl,
-	kvm-unit-test, libcurl, libfastjson, libglib2, libidn,
-	libpjsip, libplist, localedef, lttng-tools, luajit, mesa3d,
-	moarvm, mp4v2, openssh, openssl, oracle-mysql, postgresql,
-	python3, python-pyqt5, qt, qt5base, qt5canvas3d,
-	qt5connectivity, qt5declarative, qt5engineio,
-	qt5graphicaleffects, qt5imageformats, qt5location,
-	qt5multimedia, qt5quickcontrols, qt5quickcontrols2, qt5script,
-	qt5sensors, qt5serialbus, qt5serialport, qt5svg, qt5tools,
-	qt5webchannel, qt5webkit, qt5websockets, qt5x11extras,
-	qt5xmlpatterns, quagga, redis, ruby, samba4, sdl2, snmppp,
-	swupdate, ti-gfx, uboot-tools, usb_modeswitch, vboot-utils,
-	webkitgtk, wget, wireshark, xapp_xdriinfo.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
-	10361: python3 python-config script generates invalid includes
-	10501: host-localedef fails to compile on Ubuntu 17.10
-
-2017.08.1, Released October 23rd, 2017
-
-	Important / security related fixes.
-
-	Webkitgtk bumped to the 2.18.x series, fixing a large number
-	of security issues.
-
-	Defconfigs: galileo: fix ext4 related kernel config, bump
-	kernel for gcc 6.x compatibility, enable wchar support for
-	grub2. wandboard: correct rootfs offset
-
-	support: Ensure gzip compression level 6 is used for git
-	tarballs. check-bin-arch: Correctly handle (ignore) symbolic
-	links. check-rpath: Also handle PIE binaries
-
-	External toolchain: Correctly handle glibc Buildroot
-	toolchains built with merged /usr
-
-	musl: fix ARMv4 build with binutils 2.27.51+, fix for
-	CVE-2017-15650
-
-	Updated/fixed packages: apache, augeas, bind, bluez5_utils,
-	busybox, bzip2, cmake, dnsmasq, ejabberd, gcc, git, go, ffmpeg, file,
-	flashrom, gd, gdk-pixbug, gnupg2, hostapd, ifupdown-scripts,
-	imagemagick, iucode-tool, kernel-module-imx-gpu-viv, lame,
-	libarchive, libcurl, libffi, libidn, libmbim, libnspr, libnss,
-	libressl, librsync, libsoup, libxml2, libzip, mbedtls, musl,
-	netplug, nginx, openvpn, pkgconf, poppler, proxychains-ng,
-	qemu, qt, rpi-userland, syslog, ruby, samba4, softether,
-	sqlite, strongswan, subversion, supertuxkart, supervisor, tcpdump,
-	tor, unrar, urq, vboot-utils, webkitgtk, wpa_supplicant, xen,
-	xmlstarlet, xlib_libXfont, xlib_libXfont2,
-	xserver_xorg-server, zsh
-
-2017.08, Released September 1st, 2017
-
-	Minor fixes.
-
-	Toolchain: Don't allow internal toolchain builds for MIPS
-	M6201/P6600, as support for these are not yet in mainline GCC.
-
-	Updated/fixed packages: bcusdk, connman, dialog, dnsmasq,
-	gnupg, grub2, iostat, iucode-tool, libgcrypt, libkcapi,
-	libphidget, libv4l, linux-tools, mediastreamer, minidlna,
-	nss-pam-ldapd, nvidia-driver, qt-webkit-kiosk, rpcbind, squid,
-	transmission, vde2, vim
-
-	Updated/fixed defconfigs:
-
-	Removed packages: simicfs.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10261: Grub2 fails to build for x86_64
-
-2017.08-rc3, Released August 23rd, 2017
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: alsa-lib, alsa-utils, cc-tool,
-	dbus-cpp, e2fsprogs, elf2flt, faad2, fakeroot, gcc, git, gpsd,
-	gst1-validate, kvmtool, libconfuse, libepoxy, librsync,
-	libspatialindex, libunwind, linux, linux-headers, lua,
-	mariadb, mesa3d, mtd, openocd, python3, syslinux, sysvinit,
-	whois, xen, zmqpp.
-
-	Updated/fixed defconfigs: ci20, socrates_cyclone5,
-	toradex_apalis_imx6.
-
-	Removed defconfig: Armadeus APF9328.
-
-	skeleton-* packages introduced in -rc1 have been renamed to
-	skeleton-init-* instead.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10141: Squashfs extended attribute failures
-
-2017.08-rc2, Released August 11th, 2017
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: bind, dbus, erlang-p1-xml, faad2,
-	ficl, gcc, gdb, glibc, jack2, libcurl, linux, linux-headers,
-	lua, mutt, nvme, qt5base, skeleton-common, snappy, stella,
-	swupdate, uclibc, valgrind, webkitgtk.
-
-	Updated/fixed defconfigs: beaglebone_qt5, minnowboard_max,
-	nanopi_m1{, _plus}, olimex_a20_olinuxino_lime, qemu_sparc,
-	qemu_sparc64.
-
-	The cmake-package infrastructure for host packages has been
-	fixed to not incorrectly detect target packages through
-	pkg-config.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#9926:  systemd-resolved.service: Failed at step NAMESPACE (systemd 233)
-	#10021: libqeglfs-viv-integration.so file is missing for qt5 on armv7
-	#10026: lua-5.3.4: fix lua linker error in swupdate
-	#10146: package/skeleton-common fix recursive variable
-	#10156: glibc compilation fails for X86 32bits (i386)
-	#10201: toolchain-wrapper.c:192: (error) Memory leak:
-	#10221: Buildroot Support
-
-2017.08-rc1, Released August 2nd, 2017
-
-	Infrastructure:
-
-	- The skeleton package has been split into multiple packages:
-	  skeleton-sysv (when Busybox or SysV init are used),
-	  skeleton-systemd (when systemd is used), skeleton-none (when
-	  no init system is used) and skeleton-custom (when a custom
-	  skeleton is used). Those packages, except skeleton-custom,
-	  share common logic and data in a new package called
-	  skeleton-common. The skeleton package becomes a virtual
-	  package. This change allows to generate a filesystem that is
-	  compliant with systemd expectations.
-
-	- Support for using a read-only filesystem with systemd has
-	  been fixed.
-
-	- Major revamp of the gettext handling, with user-visible
-	  effect:
-
-	  - prior to this revamp, when BR2_ENABLE_LOCALE=y, each
-	    package could decide to enable or not NLS support. When
-	    BR2_ENABLE_LOCALE was disabled, NLS support was forced off
-	    by passing --disable-nls to packages.
-
-	  - after this revamp, a new BR2_SYSTEM_ENABLE_NLS option
-	    controls whether NLS support should be enabled or not in
-	    packages. This option defaults to disabled, which means
-	    that now, NLS support is by default disabled in all
-	    packages.
-
-	  Therefore, if you need NLS support in packages, you must now
-	  explicitly enable the BR2_SYSTEM_ENABLE_NLS option.
-
-	- The host directory no longer has a usr/ component. This
-	  makes it much more natural to use that directory as an
-	  externally used toolchain. For compatibility with existing
-	  scripts, a usr -> . link is still added.
-
-	- Hashes are now checked on tarballs by Buildroot when a
-	  package is sourced from a Git repository.
-
-	- Patches are no longer being downloaded from Github, since
-	  auto-generated patches could change over time, and break
-	  hashes. All patches that were downloaded from Github are now
-	  stored in their respective package directories.
-
-	- Hash files in packages can now contain hashes for the
-	  license files contained in the package source code. This
-	  allows to detect changes in such license files.
-
-	- Binaries in $(TARGET_DIR) are now cleaned up from invalid
-	  RPATHs at the end of the build.
-
-	- A new "make sdk" target prepares $(HOST_DIR) to be
-	  relocatable: turns RPATHs in host binaries into relocatable
-	  ones, removes bogus RPATHs from staging binaries/libraries,
-	  and provides a relocate-sdk script that can be executed to
-	  relocate the SDK after installation.
-
-	- Addition of utils/genrandconfig which generates a random
-	  configuration based on a set of pre-defined toolchain
-	  configurations (support/config-fragments/autobuild/) and a
-	  random selection of packages. It is now used by the
-	  autobuilders to generate the random configurations.
-
-	Filesystems:
-
-	- ext2/3/4 filesystems are now generated using mkfs.ext from
-	  e2fsprogs instead of using genext2fs.
-
-	Architecture:
-
-	- Addition of support for ARM big.LITTLE variants
-	- Improved MIPS support, with options to select NaN encoding
-	  and FP32 mode.
-
-	Toolchain:
-
-	- Switch to gcc 6.x as the default gcc version, add support
-	  for gcc 7.x, remove support for gcc 4.8
-	- Switch to binutils 2.28 as the default binutils version, add
-	  support for binutils 2.29, remove support for binutils 2.26
-	- Support added for gdb 8.0
-	- uClibc-ng bumped to 1.0.26
-	- CodeSourcery toolchains for x86 and SuperH have been
-	  removed, they were using a too old glibc version
-	  (2.17). External toolchains with glibc 2.17 or earlier are
-	  no longer supported.
-	- The version selection in the glibc package has been
-	  removed. Like musl and uClibc-ng, we now use the latest
-	  glibc version.
-	- Improved support for Xtensa toolchain overlays, which can
-	  now be downloaded.
-
-	Tools:
-
-	- Numerous improvements to the runtime test infrastructure
-	- Tests are now executed by Gitlab CI on a regular basis
-	- Tools that are directly useful to the user have been moved
-	  from support/scripts/ to utils/: brmake, check-package,
-	  get-developers, scancpan, scanpipy, size-stats-compare,
-	  test-pkg.
-
-	New defconfigs: A13 Olinuxino, Engicam platforms (i.CoreM6
-	Solo/Dual/DualLite/Quad, RQS SOM, GEAM6UL SOM, Is.IoT MX6UL
-	SOM), Nano Pi M1 (Plus), OrangePi Zero and Plus.
-
-	New packages: azure-iot-sdk-c, cracklib, dt-utils, easy-rsa,
-	erlang-jiffy, erlang-p1-oauth2, erlang-p1-xmpp,
-	ifupdown-scripts, irrlicht, kodi-inputstream-adaptive,
-	kodi-inputstream-rtmp, kvazaar, let-me-create, libloki,
-	libpwquality, libressl, libspatialindex, libva-utils,
-	linuxconsoletools, linuxptp, luaossl, lua-sdl2, lua-stdlib,
-	lsscsi, paxtest, pcre2, pixz, python-asn1crypto,
-	python-backports-shutil-get-terminal-size, python-bcrypt,
-	python-cheroot, python-h2, python-hpack, python-hyperframe,
-	python-hyperlink, python-ipython-genutils, python-pathlib2,
-	python-pickleshare, python-priority, python-portend,
-	python-scandir, python-systemd, python-tempora,
-	python-traitlets, python-typepy, qt5virtualkeyboard,
-	ratpoison, rauc, refpolicy, rhash, sdl2_mixer, sdl2_net,
-	xr819-xradio, zstd
-
-	Removed packages: cloog, input-tools, mke2img
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#7892: systemd-journald is broken
-	#9341: avahi-utils does not compile with uClibc +  libglib2
-	#9441: Link BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY to
-	       BR2_ENABLE_DEBUG
-	#9746: ext4 image generated by Buildroot is not working
-	       properly with U-Boot
-	#9886: Build fails with "unexpected EOF while looking for
-	       matching `"'" if PATH contains a newline
-	#9891: parted 3.1 => 3.2?
-	#9911: qt5 does not build on sparc
-	#9916: qt5 does not build on
-	       arm-buildroot-linux-uclibcgnueabihf for ARMv8 cores
-	#9936: Host QEMU does not build with SDL support because of
-	       pkg-config
-	#9941: nodejs option disappears for arm
-	#9951: SCANCPAN failure
-	#9966: util-linux-2.30/.stamp_built' failed
-	#9976: License file for package 'rtl8821au' incorrect
-	#9991: SGX Error implicit declaration of function
-	       ‘dmac_map_area’
-	#10011: wget does not work from Buildroot
-	#10036: Buildroot builds Raspbian Jessie headless image
-		presenting incorrect prompt
-	#10051: make: *** No rule to make target
-		'raspberrpi3_defconfig'. Stop reported with Buildroot
-		v2017.05.1
-	#10056: No .config file was produced in /buildroot folder
-	#10061: gcc5.4 buildroot toolchain for powerpc libsanitizer
-		failure
-	#10071: fakeroot: replace hard-coded paths in post install
-	#10076: Makefile:4113: recipe for target 'all-gcc'  failed
-	#10091: gcc7.1 does not build with graphite support due to old
-		isl
-	#10121: webkit without the multimedia option causes build
-		error
-
 2017.05.2, Released July 27th, 2017

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

-2017.02.8, Released November 27th, 2017
-
-	Important / security related fixes.
-
-	Qt: 5.6 version updated to 5.6.3.
-
-	Reproducible: Do not override SOURCE_DATE_EPOCH if already set
-	in the environment.
-
-	Updated/fixed packages: apr, apr-util, arqp-standalone,
-	collectd, dvb-apps, ffmpeg, google-breakpad, gstreamer,
-	imagemagick, libfastjson, libglib2, libpjsip, libplist,
-	localedef, luajit, mesa3d, openssh, openssl, postgresql,
-	python3, python-pyqt5, qt5base, qt5canvas3d, qt5connectivity,
-	qt5declarative, qt5engineio, qt5graphicaleffects,
-	qt5imageformats, qt5location, qt5multimedia, qt5quickcontrols,
-	qt5quickcontrols2, qt5script, qt5sensors, qt5serialbus,
-	qt5serialport, qt5svg, qt5tools, qt5webchannel, qt5webkit,
-	qt5websockets, qt5x11extras, qt5xmlpatterns, quagga, ruby,
-	samba4, snmppp, ti-gfx, vboot-utils, webkitgtk, wireshark,
-	xapp_xdriinfo.
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
-	10361: python3 python-config script generates invalid includes
-	10501: host-localedef fails to compile on Ubuntu 17.10
-
-2017.02.7, Released October 28th, 2017
-
-	Important / security related fixes.
-
-	Webkitgtk bumped to the 2.18.x series, fixing a large number
-	of security issues.
-
-	Defconfigs: wandboard: Correct rootfs offset
-
-	Toolchain: Linaro toolchains updated to 2017.08 release,
-	fixing a number of issues. Musl: fix for CVE-2017-15650.
-
-	Updated/fixed packages: busybox, bzip2, dnsmasq, git, go,
-	hostapd, irssi, iucode-tool, lame, libcurl, libffi, libnspr,
-	libnss, nodejs, openssh, openvpn, qemu, qt, redis, sdl2,
-	webkitgtk, wget, wpa_supplicant, xen, xlib_libXfont,
-	xlib_libXfont2, xserver_xorg-server
-
-2017.02.6, Released September 24th, 2017
-
-	Important / security related fixes.
-
-	Cmake: Ensure correct pkg-config is used when building host
-	packages
-
-	fs/iso9660: Ensure files from earlier builds are not included.
-
-	Updated/fixed packages: apache, bcusdk, bind, binutils,
-	bluez5_utils, botan, cmake, connman, dbus, dialog, e2fsprogs,
-	faad2, fakeroot, ffmpeg, file, flashrom, gcc, gd, gdb,
-	gdk-pixbuf, git, gnupg, gpsd, grub2, gst1-plugins-bad,
-	imagemagick, iostat, iucode-tool, jack2, libarchive, libcurl,
-	libgcrypt, libidn, libphidget, librsync, librsvg, libsoup,
-	libxml2, linux-tools, lua, mariadb, mbedtls, mediastreamer,
-	minidlna, netplug, nss-pam-ldapd, nvidia-driver, openjpeg,
-	postgresql, proxychains-ng, python-libconfig,
-	python-service-identity, qt, rpcbind, ruby, samba4, squashfs,
-	squid, strongswan, subversion, supervisor, sysvinit, tcpdump,
-	tor, transmission, unrar, valgrind, vim, webkitgtk, whois,
-	xen, zmqpp
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10141: Squashfs extended attribute failures
-	#10261: Grub2 fails to build for x86_64
-	#10276: BR2_PACKAGE_LINUX_TOOLS_GPIO fails for MIPS with...
-
-2017.02.5, Released July 27th, 2017
-
-	Important / security related fixes.
-
-	Webkitgtk bumped to the 2.16.x series, fixing a large number
-	of security issues.
-
-	host-aespipe compile fix for Debian/Gentoo/Ubuntu toolchains
-	which default to PIE mode.
-
-	Updated/fixed packages: aespipe, apache, bind, binutils,
-	busybox, ccache, collectd, efibootmgr, efivar, expat, ffmpeg,
-	gcc, heimdal, iproute2, irssi, libglib2, libmemcached,
-	libosip2, libtirpc, libxml-parser-perl, linux-fusion,
-	linux-zigbee, mpg123, nodejs, orc, pcre, php, pulseaudio,
-	python-setproctitle, qt5base, rpi-firmware, samba4, syslinux,
-	systemd, spice, tcpdump, tiff, webkitgtk, x265, xen,
-	xserver_xorg-server, xvisor
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#10061: gcc5.4 buildroot toolchain for powerpc libsanitizer...
-
-2017.02.4, Released July 4th, 2017
-
-	Important / security related fixes.
-
-	Update support/scripts/scancpan to use METACPAN v1 API as v0
-	has been shutdown.
-
-	Update support/scripts/mkusers to handle setups where
-	/etc/shadow is a symlink.
-
-	External toolchain: Don't create musl dynamic loader symlink
-	for static builds.
-
-	Setlocalversion: Correct detection of mercurial revisions for
-	non-tagged versions.
-
-	Updated/fixed packages: apache, automake, bind, botan, c-ares,
-	dhcp, expat, fcgiwrap, gcc, gdb, gesftpserver, glibc, gnutls,
-	gst1-plugins-bad, imagemagick, imx-uuc, intltool, iperf,
-	ipsec-tools, irssi, libgcrypt, libmad, libnl, mosquitto,
-	mpg123, ncurses, nodejs, ntp, openssh, openvpn, qt5base,
-	qt5multimedia, rtl8821au, socat, spice, systemd, tor, tslib,
-	vlc, x264, xserver_xorg-server
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#9976: License file for package 'rtl8821au' incorrect
-
-2017.02.3, Released June 2nd, 2017
-
-	Important / security related fixes.
-
-	Download: <pkg>-source-check fixed for packages from git.
-
-	External toolchain: musl dynamic linker symlink for mips-sf
-	corrected.
-
-	Updated/fixed packages: armadillo, audiofile, bash,
-	bluez_utils, cppcms, dbus, dhcp, dropbear, efibootmgr, efl,
-	elfutils, faketime, fbgrab, flashrom, ftop, gdb, git,
-	google-breakpad, gpsd, hans, kvm-unit-tests, kyua, libev,
-	libmicrohttpd, libminiupnpc, libtasn1, libubox, ltp-testsuite,
-	lua, madplay, mariadb, mono, mosquitto, mxml, ntp,
-	nvidia-driver, openblas, openvpn, oracle-mysql, picocom, popt,
-	postgresql, pulseview, qt5base, qwt, rabbitmq-c, redis,
-	rpcbind, rtmpdump, samba4, strongswan, sudo, vlc
-
-	Issues resolved (http://bugs.buildroot.org):
-
-	#9796: source-check broken for Git downloads
-	#9871: fbgrab 1.3 won't build with BR2_REPRODUCIBLE set
-
 2017.02.2, Released May 1st, 2017

 	Important / security related fixes.
--- a/Config.in
+++ b/Config.in
@@ -63,7 +63,7 @@ config BR2_HOST_GCC_AT_LEAST_7
 	select BR2_HOST_GCC_AT_LEAST_6

 # Hidden boolean selected by packages in need of Java in order to build
-# (example: kodi)
+# (example: xbmc)
 config BR2_NEEDS_HOST_JAVA
 	bool

@@ -106,7 +106,7 @@ config BR2_WGET

 config BR2_SVN
 	string "Subversion (svn) command"
-	default "svn --non-interactive"
+	default "svn"

 config BR2_BZR
 	string "Bazaar (bzr) command"
@@ -419,10 +419,13 @@ config BR2_DEBUG_3
 endchoice
 endif

+choice
+	prompt "strip command for binaries on target"
+	default BR2_STRIP_strip
+
 config BR2_STRIP_strip
-	bool "strip target binaries"
+	bool "strip"
 	depends on !BR2_PACKAGE_HOST_ELF2FLT
-	default y
 	help
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the normal 'strip' command. This allows to save
@@ -430,9 +433,15 @@ config BR2_STRIP_strip
 	  on the target are needed for native debugging, but not when
 	  remote debugging is used.

+config BR2_STRIP_none
+	bool "none"
+	help
+	  Do not strip binaries and libraries in the target filesystem.
+endchoice
+
 config BR2_STRIP_EXCLUDE_FILES
 	string "executables that should not be stripped"
-	depends on BR2_STRIP_strip
+	depends on !BR2_STRIP_none
 	default ""
 	help
 	  You may specify a space-separated list of binaries and
@@ -440,7 +449,7 @@ config BR2_STRIP_EXCLUDE_FILES

 config BR2_STRIP_EXCLUDE_DIRS
 	string "directories that should be skipped when stripping"
-	depends on BR2_STRIP_strip
+	depends on !BR2_STRIP_none
 	default ""
 	help
 	  You may specify a space-separated list of directories that
@@ -458,7 +467,7 @@ choice
 config BR2_OPTIMIZE_0
 	bool "optimization level 0"
 	help
-	  Do not optimize.
+	  Do not optimize. This is the default.

 config BR2_OPTIMIZE_1
 	bool "optimization level 1"
@@ -525,7 +534,6 @@ config BR2_OPTIMIZE_S
 	  -falign-loops -falign-labels -freorder-blocks
 	  -freorder-blocks-and-partition -fprefetch-loop-arrays
 	  -ftree-vect-loop-version
-	  This is the default.

 endchoice

@@ -539,7 +547,6 @@ config BR2_GOOGLE_BREAKPAD_ENABLE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	help
 	  This option will enable the use of google breakpad, a library
 	  and tool suite that allows you to distribute an application to
@@ -713,8 +720,6 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH

 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
-	# SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
 	help
 	  This option will remove all sources of non-reproducibility
 	  from the build process. For a given Buildroot configuration,
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -143,266 +143,8 @@ comment "----------------------------------------------------"
 endif

 ###############################################################################
-comment "Legacy options removed in 2017.11"

-config BR2_PACKAGE_RFKILL
-	bool "rfkill package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_RFKILL
-	help
-	  The rfkill program is now provided by the util-linux package.
-
-config BR2_PACKAGE_UTIL_LINUX_RESET
-	bool "util-linux reset option removed"
-	select BR2_LEGACY
-	help
-	  The util-linux package no longer offers a "reset" command. Use
-	  either the reset command provided by BusyBox or select ncurses
-	  programs, which will install a symlink from "tset" to reset.
-
-config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW
-	bool "policycoreutils audit2allow option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SELINUX_PYTHON
-	select BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW
-	help
-	  The policycoreutils package no longer offers audit2allow
-	  as a option. This package has been moved into the
-	  selinux-python package by the SELinux maintainers.
-
-config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND
-	bool "policycoreutils restorecond option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_RESTORECOND
-	help
-	  The policycoreutils package no longer offers restorecond
-	  as a option.  This package has been moved into a seperate
-	  package maintained by the SELinux maintainers.
-
-config BR2_PACKAGE_SEPOLGEN
-	bool "sepolgen package has been removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SELINUX_PYTHON
-	select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
-	help
-	  Sepolgen is no longer a individual package, but instead has
-	  been moved into the selinux-python package by the SELinux
-	  maintainers.
-
-config BR2_PACKAGE_OPENOBEX_BLUEZ
-	bool "openobex bluez option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_BLUEZ_UTILS
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable BlueZ support. Instead, BlueZ support is always
-	  included when the bluez5_utils or bluez_utils package is
-	  selected.
-
-config BR2_PACKAGE_OPENOBEX_LIBUSB
-	bool "openobex libusb option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LIBUSB
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable libusb support. Instead, USB support is always
-	  included when the libusb package is selected.
-
-config BR2_PACKAGE_OPENOBEX_APPS
-	bool "openobex apps option removed"
-	select BR2_LEGACY
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable apps support.
-
-config BR2_PACKAGE_OPENOBEX_SYSLOG
-	bool "openobex syslog option removed"
-	select BR2_LEGACY
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable syslog support.
-
-config BR2_PACKAGE_OPENOBEX_DUMP
-	bool "openobex dump option removed"
-	select BR2_LEGACY
-	help
-	  The OpenOBEX package no longer offers an option to enable or
-	  disable dump support.
-
-config BR2_PACKAGE_AICCU
-	bool "aiccu utility removed"
-	select BR2_LEGACY
-	help
-	  As the SixXS project has ceased its operation on 2017-06-06,
-	  the AICCU utility has no use anymore and has been removed.
-
-	  https://www.sixxs.net/sunset/
-
-config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
-	bool "util-linux login utilities option removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_UTIL_LINUX_LAST
-	select BR2_PACKAGE_UTIL_LINUX_LOGIN
-	select BR2_PACKAGE_UTIL_LINUX_RUNUSER
-	select BR2_PACKAGE_UTIL_LINUX_SU
-	select BR2_PACKAGE_UTIL_LINUX_SULOGIN
-	help
-	  Login utilities (last, login, runuser, su, sulogin) now have
-	  their own configuration options in the util-linux menu.
-
-###############################################################################
-comment "Legacy options removed in 2017.08"
-
-config BR2_TARGET_GRUB
-	bool "grub (aka grub-legacy) has been removed"
-	select BR2_LEGACY
-	help
-	  grub-legacy is no longer maintained, and no longer builds with
-	  recent binutils versions.
-
-	  Use grub2 or syslinux instead.
-
-config BR2_PACKAGE_SIMICSFS
-	bool "simicsfs support removed"
-	select BR2_LEGACY
-	help
-	  Support for simicsfs kernel driver that provides access to a
-	  host computer's local filesystem when the target is
-	  executing within a SIMICS simulation has been removed.
-
-	  Simics is now moving away from the simicsfs kernel module,
-	  as the kernel module has required too much maintenance
-	  work. Users should move to the user mode Simics agent
-	  instead.
-
-config BR2_BINUTILS_VERSION_2_26_X
-	bool "binutils version 2.26 support removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils version 2.26 has been removed. The
-	  current default version (2.28 or later) has been selected
-	  instead.
-
-config BR2_XTENSA_OVERLAY_DIR
-	string "The BR2_XTENSA_OVERLAY_DIR option has been removed"
-	help
-	  The BR2_XTENSA_OVERLAY_DIR has been removed in favour of
-	  BR2_XTENSA_OVERLAY_FILE. You must now pass the complete
-	  path to the overlay file, not to the directory containing
-	  it.
-
-config BR2_XTENSA_OVERLAY_DIR_WRAP
-	bool
-	default y if BR2_XTENSA_OVERLAY_DIR != ""
-	select BR2_LEGACY
-
-config BR2_XTENSA_CUSTOM_NAME
-	string "The BR2_XTENSA_CUSTOM_NAME option has been removed"
-	help
-	  The BR2_XTENSA_CUSTOM_NAME option has been removed.
-
-config BR2_XTENSA_CUSTOM_NAME_WRAP
-	bool
-	default y if BR2_XTENSA_CUSTOM_NAME != ""
-	select BR2_LEGACY
-
-config BR2_PACKAGE_HOST_MKE2IMG
-	bool "host mke2img has been removed"
-	select BR2_LEGACY
-	help
-	  We now call mkfs directly to generate ext2/3/4 filesystem
-	  image, so mke2img is no longer necessary.
-
-config BR2_TARGET_ROOTFS_EXT2_BLOCKS
-	int "exact size in blocks has been removed"
-	default 0
-	help
-	  This option has been removed in favor of
-	  BR2_TARGET_ROOTFS_EXT2_SIZE. It has been set automatically
-	  to the value you had before. Set to 0 here to remove the
-	  warning.
-
-config BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP
-	bool
-	default y if BR2_TARGET_ROOTFS_EXT2_BLOCKS != 0 && \
-		BR2_TARGET_ROOTFS_EXT2_BLOCKS != 61440 # deprecated default value
-	select BR2_LEGACY
-
-# Note: BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP still referenced in fs/ext2/Config.in
-
-config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES
-	int "ext2 extra inodes has been removed" if BR2_TARGET_ROOTFS_EXT2_INODES = 0
-	default 0
-	help
-	  Buildroot now uses mkfs.ext2/3/4 to generate ext2/3/4
-	  images. It now automatically selects the number of inodes
-	  based on the image size. The extra number of inodes can no
-	  longer be provided; instead, provide the total number of
-	  inodes needed in BR2_TARGET_ROOTFS_EXT2_INODES.
-
-config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES_WRAP
-	bool
-	default y if BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES != 0
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE
-	bool "cdxaparse removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC
-	bool "dataurisrc moved to gstreamer1"
-	select BR2_LEGACY
-	help
-	  Dataurisrc has moved to gstreamer core and is always built.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP
-	bool "dccp removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE
-	bool "hdvparse removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE
-	bool "mve removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX
-	bool "nuvdemux removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT
-	bool "patchdetect removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI
-	bool "sdi removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA
-	bool "tta removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
-	bool "videomeasure removed"
-	select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA
-	select BR2_LEGACY
-	help
-	  videomeasure plugin has been removed and has been replaced by
-	  iqa, which has automatically been enabled.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK
-	bool "apexsink removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL
-	bool "sdl removed"
-	select BR2_LEGACY
-
-config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD
-	bool "mad (*.mp3 audio) removed"
-	select BR2_LEGACY
+comment "Legacy options removed in 2017.05"

 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC
 	bool "gst1-plugins-bad webrtc renamed to webrtcdsp"
@@ -414,21 +156,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC
 	  name webrtc. Therefore, we have renamed the option to match
 	  the actual name of the GStreamer plugin.

-config BR2_STRIP_none
-	bool "Strip command 'none' has been removed"
-	select BR2_LEGACY
-	help
-	  The strip command choice has been changed into a single
-	  boolean option. Please check that the new setting is
-	  correct (in the "Build options" sub-menu)
-
-config BR2_PACKAGE_BEECRYPT_CPP
-	bool "C++ support removed in beecrypt"
-	select BR2_LEGACY
-	help
-	  Support for C++ depends on icu. The beecrypt package is
-	  incompatible with icu 59+.
-
 config BR2_PACKAGE_SPICE_CLIENT
 	bool "spice client support removed"
 	select BR2_LEGACY
@@ -452,72 +179,6 @@ config BR2_PACKAGE_SPICE_TUNNEL
 	  Spice network redirection, aka tunnelling has been removed
 	  upstream.

-config BR2_PACKAGE_INPUT_TOOLS
-	bool "input-tools removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LINUXCONSOLETOOLS
-	help
-	  input-tools has been removed, it is replaced by
-	  linuxconsoletools, which has automatically been enabled.
-
-config BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH
-	bool "inputattach moved to linuxconsoletools"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LINUXCONSOLETOOLS
-	select BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH
-	help
-	  input-tools has been removed, inputattach is now part
-	  of linuxconsoletools, which has automatically been
-	  enabled.
-
-config BR2_PACKAGE_INPUT_TOOLS_JSCAL
-	bool "jscal moved to linuxconsoletools"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LINUXCONSOLETOOLS
-	select BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK
-	help
-	  input-tools has been removed, jscal is now part
-	  of linuxconsoletools, which has automatically been
-	  enabled.
-
-config BR2_PACKAGE_INPUT_TOOLS_JSTEST
-	bool "jstest moved to linuxconsoletools"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LINUXCONSOLETOOLS
-	select BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK
-	help
-	  input-tools has been removed, jstest is now part
-	  of linuxconsoletools, which has automatically been
-	  enabled.
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
-	bool "SH Sourcery toolchain has been removed"
-	select BR2_LEGACY
-	help
-	  The Sourcery CodeBench toolchain for the sh architecture has
-	  been removed, since it uses glibc older than 2.17 that requires
-	  -lrt to link executables using clock_* system calls. This makes
-	  this toolchain difficult to maintain over time.
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86
-	bool "x86 Sourcery toolchain has been removed"
-	select BR2_LEGACY
-	help
-	  The Sourcery CodeBench toolchain for the x86 architecture has
-	  been removed, since it uses glibc older than 2.17 that requires
-	  -lrt to link executables using clock_* system calls. This makes
-	  this toolchain difficult to maintain over time.
-
-config BR2_GCC_VERSION_4_8_X
-	bool "gcc 4.8.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 4.8.x has been removed. The current
-	  default version (5.x or later) has been selected instead.
-
-###############################################################################
-comment "Legacy options removed in 2017.05"
-
 config BR2_PACKAGE_SUNXI_MALI_R2P4
 	bool "sunxi-mali r2p4 removed"
 	select BR2_LEGACY
@@ -562,7 +223,6 @@ config BR2_PACKAGE_OPENOCD_FT2XXX
 config BR2_PACKAGE_KODI_RTMPDUMP
 	bool "kodi rtmp has been removed"
 	select BR2_LEGACY
-	select BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
 	help
 	  Internal rtmp support was removed from Kodi.

--- a/415
+++ b/415
@@ -31,40 +31,18 @@ F:	package/gstreamer1/gst1-rtsp-server/

 N:	Adam Duskett <aduskett@gmail.com>
 F:	package/audit/
-F:	package/busybox/
 F:	package/checkpolicy/
-F:	package/cppdb/
-F:	package/gstreamer1/gstreamer1/
-F:	package/gstreamer1/gst1-plugins-bad/
-F:	package/gstreamer1/gst1-plugins-base/
-F:	package/gstreamer1/gst1-plugins-good/
-F:	package/gstreamer1/gst1-plugins-ugly/
 F:	package/gstreamer1/gst1-vaapi/
-F:	package/imx-usb-loader/
-F:	package/janus-gateway/
-F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/nginx-naxsi/
 F:	package/policycoreutils/
 F:	package/python-mutagen/
-F:	package/restorecond/
-F:	package/refpolicy/
-F:	package/selinux-python/
-F:	package/semodule-utils/
+F:	package/sepolgen/
 F:	package/setools/
 F:	package/sngrep/

-N:	Adrian Perez de Castro <aperez@igalia.com>
-F:	package/libepoxy/
-F:	package/webkitgtk/
-
-N:	Aleksander Morgado <aleksander@aleksander.es>
-F:	package/libmbim/
-F:	package/libqmi/
-F:	package/modem-manager/
-
 N:	Alex Suykov <alex.suykov@gmail.com>
 F:	package/vboot-utils/

@@ -85,10 +63,6 @@ F:	package/liblog4c-localtime/
 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.francis@xilinx.com>
 F:	package/xen/

@@ -101,31 +75,18 @@ N:	Anders Darander <anders@chargestorm.se>
 F:	package/ktap/

 N:	André Hentschel <nerv@dawncrow.de>
-F:	package/azure-iot-sdk-c/
 F:	package/openal/
 F:	package/p7zip/
 F:	package/wine/

-N:	Andrey Smirnov <andrew.smirnov@gmail.com>
-F:	package/python-backports-shutil-get-terminal-size/
+N:	Andrey Smirnov <andrew.smirnov@gmail.com
 F:	package/python-decorator/
-F:	package/python-ipython-genutils/
-F:	package/python-pathlib2/
-F:	package/python-pickleshare/
-F:	package/python-scandir/
 F:	package/python-simplegeneric/
-F:	package/python-systemd/
-F:	package/python-traitlets/
-F:	package/zstd/
-
-N:	Andrey Yurovsky <yurovsky@gmail.com>
-F:	package/rauc/

 N:	Andy Kennedy <andy.kennedy@adtran.com>
 F:	package/libunwind/

 N:	Angelo Compagnucci <angelo.compagnucci@gmail.com>
-F:	package/i2c-tools/
 F:	package/mono/
 F:	package/mono-gtksharp3/
 F:	package/monolite/
@@ -135,9 +96,6 @@ F:	package/python-pydal/
 F:	package/python-web2py/
 F:	package/sysdig/

-N:	Antony Pavlov <antonynpavlov@gmail.com>
-F:	package/lsscsi/
-
 N:	Anthony Viallard <viallard@syscom-instruments.com>
 F:	package/gnuplot/

@@ -192,17 +150,9 @@ F:	package/sigrok-cli/

 N:	Baruch Siach <baruch@tkos.co.il>
 F:	package/daemon/
-F:	package/dropbear/
 F:	package/ebtables/
-F:	package/i2c-tools/
-F:	package/libcurl/
-F:	package/libpcap/
 F:	package/openipmi/
-F:	package/socat/
-F:	package/strace/
-F:	package/tcpdump/
 F:	package/ti-uim/
-F:	package/uhubctl/

 N:	Ben Boeckel <mathstuf@gmail.com>
 F:	package/taskd/
@@ -210,15 +160,17 @@ F:	package/taskd/
 N:	Benjamin Kamath <kamath.ben@gmail.com>
 F:	package/lapack/

+N:	Benoît Allard <benoit.allard@greenbone.net>
+F:	boot/syslinux/
+F:	package/dc3dd/
+
 N:	Bernd Kuhls <bernd.kuhls@t-online.de>
 F:	package/alsa-lib/
 F:	package/alsa-utils/
 F:	package/apache/
 F:	package/apr/
 F:	package/apr-util/
-F:	package/bcg729/
 F:	package/bluez-tools/
-F:	package/boinc/
 F:	package/clamav/
 F:	package/dovecot/
 F:	package/dovecot-pigeonhole/
@@ -227,12 +179,10 @@ F:	package/eudev/
 F:	package/exim/
 F:	package/fetchmail/
 F:	package/freeswitch/
-F:	package/freeswitch-mod-bcg729/
 F:	package/ffmpeg/
 F:	package/ghostscript/
 F:	package/giflib/
 F:	package/glmark2/
-F:	package/hdparm/
 F:	package/jsoncpp/
 F:	package/kodi*
 F:	package/lame/
@@ -270,7 +220,6 @@ F:	package/libogg/
 F:	package/libopenh264/
 F:	package/libpciaccess/
 F:	package/libplatform/
-F:	package/libpng/
 F:	package/libsidplay2/
 F:	package/libsilk/
 F:	package/libsndfile/
@@ -280,7 +229,6 @@ F:	package/libsquish/
 F:	package/liburiparser/
 F:	package/libva/
 F:	package/libva-intel-driver/
-F:	package/libva-utils/
 F:	package/libvorbis/
 F:	package/libvpx/
 F:	package/libyuv/
@@ -355,9 +303,6 @@ N:	Bogdan Radulescu <bogdan@nimblex.net>
 F:	package/iftop/
 F:	package/ncdu/

-N:	Brock Williams <brock@cottonwoodcomputer.com>
-F:	package/pdmenu/
-
 N:	Bryan Brinsko <bryan.brinsko@rockwellcollins.com>
 F:	package/pps-tools/

@@ -377,16 +322,6 @@ F:	package/libdvbsi/
 F:	package/libsvg/
 F:	package/libsvg-cairo/

-N:	Chakra Divi <chakra@openedev.com>
-F:	board/friendlyarm/nanopi-m1
-F:	board/friendlyarm/nanopi-m1-plus
-F:	board/olimex/a13_olinuxino
-F:	board/orangepi/orangepi-plus
-F:	configs/nanopi_m1_defconfig
-F:	configs/nanopi_m1_plus_defconfig
-F:	configs/olimex_a13_olinuxino_defconfig
-F:	configs/orangepi_plus_defconfig
-
 N:	Chris Packham <judge.packham@gmail.com>
 F:	package/eventlog/
 F:	package/micropython/
@@ -427,11 +362,9 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/policycoreutils/
+F:	package/sepolgen/
 F:	package/ustr/

-N:	Corentin Guillevic <corentin.guillevic@smile.fr>
-F:	package/libloki/
-
 N:	Cédric Chépied <cedric.chepied@gmail.com>
 F:	package/znc/

@@ -516,9 +449,6 @@ F:	package/nss-pam-ldapd/
 F:	package/sp-oops-extract/
 F:	package/unscd/

-N:	Dushara Jayasinghe <nidujay@gmail.com>
-F:	package/prosody/
-
 N:	Ed Swierk <eswierk@skyportsystems.com>
 F:	package/xxhash/

@@ -553,7 +483,6 @@ F:	package/efivar/
 F:	package/fwts/
 F:	package/spi-tools/
 F:	package/xdotool/
-F:	configs/pc_x86_64_*

 N:	Erik Stromdahl <erik.stromdahl@gmail.com>
 F:	package/mxsldr/
@@ -578,7 +507,6 @@ F:	package/supertuxkart/
 N:	Fabio Estevam <festevam@gmail.com>
 F:	board/warp7/
 F:	configs/freescale_imx*
-F:	configs/imx6-sabresd*
 F:	configs/imx6ulpico_defconfig
 F:	configs/mx6cubox_defconfig
 F:	configs/mx6sx_udoo_neo_defconfig
@@ -602,7 +530,6 @@ F:	package/alljoyn/
 F:	package/alljoyn-base/
 F:	package/alljoyn-tcl/
 F:	package/alljoyn-tcl-base/
-F:	package/boinc/
 F:	package/gtksourceview/
 F:	package/gssdp/
 F:	package/gupnp/
@@ -610,7 +537,6 @@ F:	package/gupnp-dlna/
 F:	package/gupnp-tools/
 F:	package/hiredis/
 F:	package/igd2-for-linux/
-F:	package/libupnp/
 F:	package/minissdpd/
 F:	package/motion/
 F:	package/tinycbor/
@@ -648,16 +574,11 @@ F:	package/perl*
 F:	package/pkg-perl.mk
 F:	package/pkg-luarocks.mk
 F:	package/qemu/
-F:	package/sdl2_mixer/
-F:	package/sdl2_net/
 F:	package/tekui/
-F:	package/wsapi-fcgi/
-F:	package/wsapi-xavante/
-F:	utils/scancpan
+F:	support/scripts/scancpan

 N:	Frank Hunleth <fhunleth@troodon-software.com>
 F:	package/am335x-pru-package/
-F:	package/libconfuse/
 F:	package/libdmtx/
 F:	package/libsodium/
 F:	package/php-amqp/
@@ -668,10 +589,6 @@ F:	package/ucl/
 F:	package/upx/
 F:	package/zxing-cpp/

-N:	Gaël Portay <gael.portay@savoirfairelinux.com>
-F:	package/qt5/qt5virtualkeyboard/
-F:	package/qt5/qt5webengine/
-
 N:	Gary Bisson <gary.bisson@boundarydevices.com>
 F:	board/boundarydevices/
 F:	configs/nitrogen*
@@ -720,6 +637,157 @@ F:	arch/Config.in.csky
 F:	board/csky/
 F:	configs/csky_*

+N:	Gustavo Zacarias <gustavo@zacarias.com.ar>
+F:	arch/Config.in.powerpc
+F:	board/qemu/
+F:	configs/qemu_*
+F:	package/argp-standalone/
+F:	package/arptables/
+F:	package/audiofile/
+F:	package/autossh/
+F:	package/bitstream-vera/
+F:	package/blktrace/
+F:	package/bmon/
+F:	package/btrfs-progs/
+F:	package/c-ares/
+F:	package/cantarell/
+F:	package/check/
+F:	package/collectd/
+F:	package/comix-cursors/
+F:	package/connman-gtk/
+F:	package/conntrack-tools/
+F:	package/cppdb/
+F:	package/crda/
+F:	package/cryptodev-linux/
+F:	package/dbus-cpp/
+F:	package/debianutils/
+F:	package/dt/
+F:	package/exfat/
+F:	package/exfat-utils/
+F:	package/f2fs-tools/
+F:	package/faad2/
+F:	package/fping/
+F:	package/ftop/
+F:	package/gcr/
+F:	package/geoip/
+F:	package/gpsd/
+F:	package/granite/
+F:	package/graphite2/
+F:	package/gsettings-desktop-schemas/
+F:	package/gstreamer1/
+F:	package/hans/
+F:	package/haveged/
+F:	package/heimdal/
+F:	package/hostapd/
+F:	package/ifupdown/
+F:	package/inconsolata/
+F:	package/iodine/
+F:	package/iperf3/
+F:	package/ipset/
+F:	package/iw/
+F:	package/jhead/
+F:	package/jquery-keyboard/
+F:	package/kompexsqlite/
+F:	package/kvmtool/
+F:	package/lame/
+F:	package/lft/
+F:	package/libao/
+F:	package/libcroco/
+F:	package/libcue/
+F:	package/libcuefile/
+F:	package/libepoxy/
+F:	package/libgee/
+F:	package/libglib2/
+F:	package/libgtk2/
+F:	package/libgtk3/
+F:	package/libmcrypt/
+F:	package/libmemcached/
+F:	package/libmhash/
+F:	package/libmnl/
+F:	package/libmng/
+F:	package/libmpdclient/
+F:	package/libnetfilter_acct/
+F:	package/libnetfilter_conntrack/
+F:	package/libnetfilter_cthelper/
+F:	package/libnetfilter_cttimeout/
+F:	package/libnetfilter_log/
+F:	package/libnetfilter_queue/
+F:	package/libnfnetlink/
+F:	package/libnl/
+F:	package/liboping/
+F:	package/libreplaygain/
+F:	package/libsamplerate/
+F:	package/libtorrent/
+F:	package/libuv/
+F:	package/lksctp-tools/
+F:	package/lshw/
+F:	package/lz4/
+F:	package/lzip/
+F:	package/mbedtls/
+F:	package/mcrypt/
+F:	package/memcached/
+F:	package/minizip/
+F:	package/mpd/
+F:	package/mpv/
+F:	package/mtr/
+F:	package/musepack/
+F:	package/ncmpc/
+F:	package/net-tools/
+F:	package/netstat-nat/
+F:	package/nettle/
+F:	package/nfacct/
+F:	package/nftables/
+F:	package/nload/
+F:	package/nmap/
+F:	package/noip/
+F:	package/norm/
+F:	package/obsidian-cursors/
+F:	package/ocf-linux/
+F:	package/opencore-amr/
+F:	package/openswan/
+F:	package/openvpn/
+F:	package/opusfile/
+F:	package/p11-kit/
+F:	package/p910nd/
+F:	package/pax-utils/
+F:	package/procrank_linux/
+F:	package/php-*
+F:	package/pkgconf/
+F:	package/privoxy/
+F:	package/protobuf-c/
+F:	package/ptpd/
+F:	package/ptpd2/
+F:	package/pwgen/
+F:	package/ramspeed/
+F:	package/rng-tools/
+F:	package/rtorrent/
+F:	package/samba4/
+F:	package/sbc/
+F:	package/snmppp/
+F:	package/sox/
+F:	package/spidev_test/
+F:	package/squid/
+F:	package/start-stop-daemon/
+F:	package/swig/
+F:	package/thrift/
+F:	package/twolame/
+F:	package/ulogd/
+F:	package/unionfs/
+F:	package/unrar/
+F:	package/ushare/
+F:	package/vala/
+F:	package/vorbis-tools/
+F:	package/wavpack/
+F:	package/wayland-protocols/
+F:	package/webkitgtk/
+F:	package/whois/
+F:	package/wireshark/
+F:	package/wpa_supplicant/
+F:	package/wpan-tools/
+F:	package/x11r7/xdriver_xf86-video-qxl/
+F:	package/xtables-addons/
+F:	package/zd1211-firmware/
+
 N:	Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
 F:	package/gnuradio/
 F:	package/gqrx/
@@ -747,16 +815,6 @@ F:	package/angularjs/
 N:	Ilias Apalodimas <apalos@gmail.com>
 F:	package/keepalived/

-N:	Jagan Teki <jagan@amarulasolutions.com>
-F:	board/bananapi/
-F:	board/engicam/
-F:	configs/bananapi_m1_defconfig
-F:	configs/engicam_imx6qdl_icore_defconfig
-F:	configs/engicam_imx6qdl_icore_qt5_defconfig
-F:	configs/engicam_imx6qdl_icore_rqs_defconfig
-F:	configs/engicam_imx6ul_geam_defconfig
-F:	configs/engicam_imx6ul_isiot_defconfig
-
 N:	James Knight <james.knight@rockwellcollins.com>
 F:	package/atkmm/
 F:	package/cairomm/
@@ -793,11 +851,6 @@ F:	package/fxload/

 N:	Joel Stanley <joel@jms.id.au>
 F:	package/pdbg/
-F:	board/qemu/ppc64le-pseries/
-F:	configs/qemu_ppc64le_pseries_defconfig
-
-N:	Joseph Kogut <joseph.kogut@gmail.com>
-F:	package/python-websockets/

 N:	Johan Derycke <johanderycke@gmail.com>
 F:	package/python-libconfig/
@@ -805,18 +858,15 @@ F:	package/python-libconfig/
 N:	Johan Oudinet <johan.oudinet@gmail.com>
 F:	package/ejabberd/
 F:	package/erlang-goldrush/
-F:	package/erlang-jiffy/
 F:	package/erlang-lager/
 F:	package/erlang-p1-cache-tab/
 F:	package/erlang-p1-iconv/
-F:	package/erlang-p1-oauth2/
 F:	package/erlang-p1-sip/
 F:	package/erlang-p1-stringprep/
 F:	package/erlang-p1-stun/
 F:	package/erlang-p1-tls/
 F:	package/erlang-p1-utils/
 F:	package/erlang-p1-xml/
-F:	package/erlang-p1-xmpp/
 F:	package/erlang-p1-yaml/
 F:	package/erlang-p1-zlib/
 F:	package/nginx-dav-ext/
@@ -845,9 +895,6 @@ F:	package/libuio/
 F:	package/netsniff-ng/
 F:	package/rabbitmq-c/

-N:	Joshua Henderson <joshua.henderson@microchip.com>
-F:	package/qt5/qt5wayland/
-
 N:	Juha Rantanen <juha@codercoded.com>
 F:	package/acsccid/

@@ -877,7 +924,6 @@ F:	package/lldpd/

 N:	Julien Viard de Galbert <julien@vdg.name>
 F:	package/dieharder/
-F:	package/easy-rsa/

 N:	Justin Maggard <jmaggard@netgear.com>
 F:	package/dtach/
@@ -924,13 +970,6 @@ F:	package/ramsmp/
 N:	Kevin Joly <kevin.joly@sensefly.com>
 F:	package/libgphoto2/

-N:	Koen Martens <gmc@sonologic.nl>
-F:	package/linuxconsoletools/
-
-N:	Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
-F:	package/bcusdk/
-F:	package/libpthsem/
-
 N:	Laurent Cans <laurent.cans@gmail.com>
 F:	package/aircrack-ng/

@@ -967,7 +1006,7 @@ F:	support/legal-info/
 N:	Lucas De Marchi <lucas.de.marchi@gmail.com>
 F:	package/fswebcam/

-N:	Ludovic Desroches <ludovic.desroches@microchip.com>
+N:	Ludovic Desroches <ludovic.desroches@atmel.com>
 F:	board/atmel/
 F:	configs/at91*
 F:	configs/atmel_*
@@ -994,11 +1033,7 @@ N:	Marcin Niestroj <m.niestroj@grinn-global.com>
 F:	board/grinn/
 F:	configs/grinn_*
 F:	package/argparse/
-F:	package/dt-utils/
 F:	package/easydbus/
-F:	package/lua-flu/
-F:	package/lua-stdlib/
-F:	package/luaossl/
 F:	package/rs485conf/
 F:	package/turbolua/

@@ -1011,16 +1046,12 @@ F:	package/polkit/
 F:	package/sg3_utils/
 F:	package/udisks/

-N:	Mario Rugiero <mrugiero@gmail.com>
-F:	package/ratpoison/
-
 N:	Markos Chandras <markos.chandras@imgtec.com>
 F:	package/harfbuzz/
 F:	package/libsecret/

 N:	Martin Bark <martin@barkynet.com>
 F:	package/ca-certificates/
-F:	package/connman/
 F:	package/nodejs/
 F:	package/tzdata/
 F:	package/zic/
@@ -1039,73 +1070,33 @@ F:	configs/ts4900_defconfig
 F:	package/ts4900-fpga/

 N:	Matt Weber <matthew.weber@rockwellcollins.com>
-F:	package/argp-standalone/
-F:	package/aufs/
-F:	package/aufs-util/
 F:	package/bc/
-F:	package/bridge-utils/
 F:	package/checkpolicy/
 F:	package/cgroupfs-mount/
-F:	package/crda/
-F:	package/devmem2/
-F:	package/dnsmasq/
-F:	package/dosfstools/
-F:	package/eeprog/
 F:	package/eigen/
-F:	package/ethtool/
-F:	package/flashbench/
 F:	package/fmc/
 F:	package/fmlib/
-F:	package/git/
-F:	package/gnutls/
-F:	package/hostapd/
-F:	package/i2c-tools/
-F:	package/ifplugd/
 F:	package/igmpproxy/
-F:	package/iperf/
-F:	package/iperf3/
 F:	package/iputils/
-F:	package/iw/
 F:	package/libcsv/
-F:	package/libcurl/
-F:	package/libfcgi/
-F:	package/libopenssl/
 F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
-F:	package/libssh2/
 F:	package/libqmi/
-F:	package/lighttpd/
-F:	package/logrotate/
-F:	package/makedevs/
-F:	package/memtester/
-F:	package/mii-diag/
-F:	package/mrouted/
-F:	package/mtd/
-F:	package/mtools/
 F:	package/nginx-upload/
 F:	package/omniorb/
-F:	package/paxtest/
-F:	package/picocom/
 F:	package/policycoreutils/
-F:	package/proftpd/
-F:	package/protobuf-c/
-F:	package/protobuf/
 F:	package/python-ipy/
 F:	package/python-posix-ipc/
 F:	package/python-pypcap/
 F:	package/python-pyrex/
 F:	package/raptor/
-F:	package/rng-tools/
-F:	package/rsyslog/
+F:	package/sepolgen/
 F:	package/setools/
+F:	package/simicsfs/
 F:	package/smcroute/
 F:	package/tclap/
-F:	package/uboot-tools/
-F:	package/unionfs/
 F:	package/valijson/
-F:	package/wpa_supplicant/
-F:	package/wireless_tools/

 N:	Mauro Condarelli <mc5686@mclink.it>
 F:	package/mc/
@@ -1166,6 +1157,7 @@ N:	Maxime Ripard <maxime.ripard@free-electrons.com>
 F:	package/kmsxx/

 N:	Michael Rommel <rommel@layer-7.net>
+F:	package/aiccu/
 F:	package/knock/
 F:	package/python-crc16/
 F:	package/python-pyzmq/
@@ -1173,10 +1165,6 @@ F:	package/python-pyzmq/
 N:	Michael Trimarchi <michael@amarulasolutions.com>
 F:	package/python-spidev/

-N:	Michał Łyszczek <michal.lyszczek@bofc.pl>
-F:	board/altera/socrates_cyclone5/
-F:	configs/socrates_cyclone5_defconfig
-
 N:	Mikhail Boiko <mikhailboiko85@gmail.com>
 F:	package/libfribidi/

@@ -1187,10 +1175,6 @@ N:	Murat Demirten <mdemirten@yh.com.tr>
 F:	package/jpeg-turbo/
 F:	package/libgeotiff/

-N:	Mike Harmony <mike.harmony@snapav.com>
-F:	board/sinovoip/m2-plus/
-F:	configs/bananapi_m2_plus_defconfig
-
 N:	Nathan Lynch <ntl@pobox.com>
 F:	package/chrony/

@@ -1225,7 +1209,6 @@ N:	Olivier Matz <olivier.matz@6wind.com>
 F:	package/python-pyelftools/

 N:	Olivier Schonken <olivier.schonken@gmail.com>
-F:	package/cups/
 F:	package/ijs/
 F:	package/poppler/
 F:	package/qpdf/
@@ -1255,13 +1238,9 @@ F:	package/libunistring/
 N:	Peter Korsgaard <peter@korsgaard.com>
 F:	board/orangepi/
 F:	configs/orangepi_pc_defconfig
-F:	package/dump1090/
 F:	package/flickcurl/
-F:	package/fscryptctl/
 F:	package/jo/
-F:	package/jose/
 F:	package/libfastjson/
-F:	package/luksmeta/
 F:	package/lzop/
 F:	package/memtool/
 F:	package/mosquitto/
@@ -1296,23 +1275,9 @@ F:	package/sdl2_gfx/
 F:	package/sdl2_image/
 F:	package/sdl2_ttf/

-N:	Petr Kulhavy <brain@jikos.cz>
-F:	package/linuxptp/
-
 N:	Petr Vorel <petr.vorel@gmail.com>
-F:	package/connman/
-F:	package/feh/
-F:	package/imlib2/
-F:	package/iproute2/
-F:	package/iputils/
-F:	package/libmbim/
-F:	package/libqmi/
 F:	package/linux-backports/
 F:	package/ltp-testsuite/
-F:	package/modem-manager/
-F:	package/network-manager/
-F:	package/ofono/
-F:	package/python-networkmanager/

 N:	Phil Eichinger <phil.eichinger@gmail.com>
 F:	package/libqrencode/
@@ -1356,7 +1321,6 @@ F:	package/glog/
 F:	package/gssdp/
 F:	package/gupnp/
 F:	package/gupnp-av/
-F:	package/let-me-create/
 F:	package/nanomsg/

 N:	Rahul Jain <rahul.jain@imgtec.com>
@@ -1366,16 +1330,14 @@ F:	package/ustream-ssl/
 N:	Renaud Aubin <root@renaud.io>
 F:	package/libhttpparser/

-N:	Rhys Williams <github@wilberforce.co.nz>
-F:	package/lirc-tools/
-
 N:	Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
 F:	package/atop/

+N:	Rhys Williams <github@wilberforce.co.nz>
+F:	package/lirc-tools/
+
 N:	Ricardo Martincoski <ricardo.martincoski@gmail.com>
-F:	support/testing/
-F:	utils/check-package
-F:	utils/checkpackagelib/
+F:	support/scripts/check*package*

 N:	Richard Braun <rbraun@sceen.net>
 F:	package/curlftpfs/
@@ -1385,9 +1347,6 @@ N:	Rico Bachmann <bachmann@tofwerk.com>
 F:	package/apr-util/
 F:	package/subversion/

-N:	RJ Ascani <rj.ascani@gmail.com>
-F:	package/azmq/
-
 N:	Rodrigo Rebello <rprebello@gmail.com>
 F:	package/chocolate-doom/
 F:	package/irssi/
@@ -1400,20 +1359,15 @@ F:	package/efl/
 F:	package/enlightenment/
 F:	package/expedite/
 F:	package/iqvlinux/
-F:	package/irrlicht/
 F:	package/liblinear/
 F:	package/lensfun/
-F:	package/libspatialindex/
 F:	package/linux-syscall-support/
 F:	package/lugaru/
 F:	package/mcelog/
-F:	package/minetest/
-F:	package/minetest-game/
 F:	package/openpowerlink/
 F:	package/physfs/
 F:	package/stress-ng/
 F:	package/supertux/
-F:	package/supertuxkart/
 F:	package/terminology/
 F:	package/upower/
 F:	package/xenomai/
@@ -1442,6 +1396,14 @@ F:	package/biosdevname/
 N:	Rémi Rérolle <remi.rerolle@gmail.com>
 F:	package/libfreeimage/

+N:	Sagaert Johan <sagaert.johan@skynet.be>
+F:	package/git/
+F:	package/gsl/
+F:	package/jquery-mobile/
+F:	package/libgsasl/
+F:	package/qdecoder/
+F:	package/qlibc/
+
 N:	Sam Bobroff <sam.bobroff@au1.ibm.com>
 F:	arch/Config.in.powerpc
 F:	package/librtas/
@@ -1483,9 +1445,6 @@ F:	package/libbson/
 F:	package/lua-resty-http/
 F:	package/mpir/

-N:	Sergey Matyukevich <geomatsi@gmail.com>
-F:	package/xr819-xradio/
-
 N:	Sergio Prado <sergio.prado@e-labworks.com>
 F:	package/libgdiplus/
 F:	package/mongodb/
@@ -1544,8 +1503,6 @@ F:	package/proxychains-ng/
 F:	package/yasm/

 N:	Stefan Sørensen <stefan.sorensen@spectralink.com>
-F:	package/cracklib/
-F:	package/libpwquality/
 F:	package/libscrypt/

 N:	Stephan Hoffmann <sho@relinux.de>
@@ -1572,15 +1529,13 @@ F:	package/tovid/
 F:	package/xorriso/

 N:	Steve Thomas <scjthm@live.com>
+F:	package/cloog/
 F:	package/isl/

 N:	Steven Noonan <steven@uplinklabs.net>
 F:	package/hwloc/
 F:	package/powertop/

-N:	Sven Haardiek <sven.haardiek@greenbone.net>
-F:	package/lcdproc/
-
 N:	Sven Neumann <neumann@teufel.de>
 F:	package/gstreamer1/gst1-libav/

@@ -1614,7 +1569,7 @@ N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
 F:	package/opkg-utils/
 F:	support/scripts/size-stats
-F:	utils/size-stats-compare
+F:	support/scripts/size-stats-compare
 F:	toolchain/

 N:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@ -1695,15 +1650,15 @@ F:	package/openmpi/
 F:	package/pinentry/
 F:	package/trinity/

-N:	Vincent Stehlé <vincent.stehle@laposte.net>
+N:	Vincent Stehlé <vincent.stehle@intel.com>
 F:	package/i7z/
 F:	package/msr-tools/
-F:	package/pixz/

 N:	Vinicius Tinti <viniciustinti@gmail.com>
 F:	package/python-thrift/

 N:	Volkov Viacheslav <sv99@inbox.ru>
+F:	package/rfkill/
 F:	package/v4l2grab/
 F:	package/zbar/

@@ -1715,10 +1670,9 @@ F:	arch/Config.in.bfin
 F:	arch/Config.in.m68k
 F:	arch/Config.in.or1k
 F:	arch/Config.in.sparc
-F:	package/glibc/
-F:	package/mksh/
 F:	package/uclibc/
 F:	package/uclibc-ng-test/
+F:	package/mksh/

 N:	Will Newton <will.newton@gmail.com>
 F:	package/enchant/
@@ -1743,12 +1697,8 @@ N:	Wojciech Niziński <niziak@spox.org>
 F:	package/fwup/

 N:	Yann E. MORIN <yann.morin.1998@free.fr>
-F:	fs/squashfs/
-F:	package/asterisk/
 F:	package/cegui06/
 F:	package/celt051/
-F:	package/dahdi-linux/
-F:	package/dahdi-tools/
 F:	package/dtc/
 F:	package/dtv-scan-tables/
 F:	package/dvb-apps/
@@ -1759,11 +1709,10 @@ F:	package/libedit/
 F:	package/libgsm/
 F:	package/libinput/
 F:	package/libiscsi/
-F:	package/libpri/
 F:	package/libseccomp/
-F:	package/libss7/
 F:	package/linux-tools/
 F:	package/mesa3d-headers/
+F:	package/mke2img/
 F:	package/nbd/
 F:	package/nut/
 F:	package/nvidia-driver/
@@ -1823,7 +1772,7 @@ F:	package/ti-utils/
 F:	package/x11r7/xapp_xconsole/
 F:	package/x11r7/xapp_xinput-calibrator/
 F:	package/zlog/
-F:	utils/scanpypi
+F:	support/scripts/scanpypi

 N:	Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
 F:	package/crudini/
--- a/146
+++ b/146
@@ -84,12 +84,11 @@ else # umask / $(CURDIR) / $(O)

 # This is our default rule, so must come first
 all:
-.PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2017.11.1
+export BR2_VERSION := 2017.05.2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1514710000
+BR2_VERSION_EPOCH = 1501136000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -126,11 +125,11 @@ DATE := $(shell date +%Y%m%d)
 # Need to export it, so it can be got from environment in children (eg. mconf)
 export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)

-# List of targets and target patterns for which .config doesn't need to be read in
 noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
-	defconfig %_defconfig allyesconfig allnoconfig alldefconfig silentoldconfig release \
+	defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	print-version olddefconfig distclean manual manual-%
+	print-version olddefconfig distclean manual manual-html manual-split-html \
+	manual-pdf manual-text manual-epub

 # Some global targets do not trigger a build, but are used to collect
 # metadata, or do various checks. When such targets are triggered,
@@ -254,7 +253,7 @@ export LANG = C
 export LC_ALL = C
 export GZIP = -n
 BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at)
-export SOURCE_DATE_EPOCH ?= $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH))
+export SOURCE_DATE_EPOCH = $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH))
 DEPENDENCIES_HOST_PREREQ += host-fakedate
 endif

@@ -440,14 +439,14 @@ TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))

 # Quotes are needed for spaces and all in the original PATH content.
-BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)"
+BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"

 # Location of a file giving a big fat warning that output/target
 # should not be used as the root filesystem.
 TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM

 ifeq ($(BR2_CCACHE),y)
-CCACHE := $(HOST_DIR)/bin/ccache
+CCACHE := $(HOST_DIR)/usr/bin/ccache
 BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR))
 export BR_CACHE_DIR
 HOSTCC := $(CCACHE) $(HOSTCC)
@@ -479,17 +478,14 @@ all: world
 # may rely on it.
 include Makefile.legacy

-include system/system.mk
 include package/Makefile.in
 # arch/arch.mk.* must be after package/Makefile.in because it may need to
 # complement variables defined therein, like BR_NO_CHECK_HASH_FOR.
-include $(sort $(wildcard arch/arch.mk.*))
+-include $(wildcard arch/arch.mk.*)
 include support/dependencies/dependencies.mk

-PACKAGES += $(DEPENDENCIES_HOST_PREREQ)
-
-include $(sort $(wildcard toolchain/*.mk))
-include $(sort $(wildcard toolchain/*/*.mk))
+include toolchain/*.mk
+include toolchain/*/*.mk

 # Include the package override file if one has been provided in the
 # configuration.
@@ -542,37 +538,19 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\

 endif

-.PHONY: dirs
 dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(HOST_DIR)/usr $(HOST_DIR)/lib $(BINARIES_DIR)
+	$(HOST_DIR) $(BINARIES_DIR)

 $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
 	$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig

-.PHONY: prepare
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf

-.PHONY: world
 world: target-post-image

-.PHONY: sdk
-sdk: world
-	@$(call MESSAGE,"Rendering the SDK relocatable")
-	$(TOPDIR)/support/scripts/fix-rpath host
-	$(TOPDIR)/support/scripts/fix-rpath staging
-	$(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh
-	echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
-
-# Compatibility symlink in case a post-build script still uses $(HOST_DIR)/usr
-$(HOST_DIR)/usr: $(HOST_DIR)
-	@ln -snf . $@
-
-$(HOST_DIR)/lib: $(HOST_DIR)
-	@mkdir -p $@
-	@case $(HOSTARCH) in \
-		(*64) ln -snf lib $(@D)/lib64;; \
-		(*)   ln -snf lib $(@D)/lib32;; \
-	esac
+.PHONY: all world toolchain dirs clean distclean source outputmakefile \
+	legal-info legal-info-prepare legal-info-clean printvars help \
+	list-defconfigs target-finalize target-post-image source-check

 # Populating the staging with the base directories is handled by the skeleton package
 $(STAGING_DIR):
@@ -626,7 +604,7 @@ define GENERATE_GLIBC_LOCALES
 		fi ; \
 		echo "Generating locale $${inputfile}.$${charmap}" ; \
 		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
-		$(HOST_DIR)/bin/localedef \
+		$(HOST_DIR)/usr/bin/localedef \
 			--prefix=$(TARGET_DIR) \
 			--$(call LOWERCASE,$(BR2_ENDIAN))-endian \
 			-i $${inputfile} -f $${charmap} \
@@ -676,7 +654,6 @@ endif

 $(TARGETS_ROOTFS): target-finalize

-.PHONY: target-finalize
 target-finalize: $(PACKAGES)
 	@$(call MESSAGE,"Finalizing target directory")
 	$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
@@ -727,9 +704,6 @@ endif
 		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
 	) >  $(TARGET_DIR)/etc/os-release

-	@$(call MESSAGE,"Sanitizing RPATH in target tree")
-	$(TOPDIR)/support/scripts/fix-rpath target
-
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
 		rsync -a --ignore-times --keep-dirlinks $(RSYNC_VCS_EXCLUSIONS) \
@@ -740,39 +714,32 @@ endif
 		$(call MESSAGE,"Executing post-build script $(s)"); \
 		$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

-.PHONY: target-post-image
 target-post-image: $(TARGETS_ROOTFS) target-finalize
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
 		$(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))

-.PHONY: source
 source: $(foreach p,$(PACKAGES),$(p)-all-source)

-.PHONY: _external-deps external-deps
 _external-deps: $(foreach p,$(PACKAGES),$(p)-all-external-deps)
 external-deps:
 	@$(MAKE1) -Bs $(EXTRAMAKEARGS) _external-deps | sort -u

 # check if download URLs are outdated
-.PHONY: source-check
 source-check: $(foreach p,$(PACKAGES),$(p)-all-source-check)

-.PHONY: legal-info-clean
 legal-info-clean:
 	@rm -fr $(LEGAL_INFO_DIR)

-.PHONY: legal-info-prepare
 legal-info-prepare: $(LEGAL_INFO_DIR)
-	@$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info")
-	@$(call legal-license-file,buildroot,buildroot,support/legal-info,COPYING,COPYING,HOST)
+	@$(call MESSAGE,"Collecting legal info")
+	@$(call legal-license-file,buildroot,COPYING,COPYING,HOST)
 	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,TARGET)
 	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,HOST)
 	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved,HOST)
 	@$(call legal-warning,the Buildroot source code has not been saved)
 	@cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config

-.PHONY: legal-info
 legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \
 		$(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST)
 	@cat support/legal-info/README.header >>$(LEGAL_REPORT)
@@ -787,14 +754,11 @@ legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p
 		mv .legal-info.sha256 legal-info.sha256)
 	@echo "Legal info produced in $(LEGAL_INFO_DIR)"

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

-.PHONY: show-build-order
 show-build-order: $(patsubst %,%-show-build-order,$(PACKAGES))

-.PHONY: graph-build
 graph-build: $(O)/build/build-time.log
 	@install -d $(GRAPHS_DIR)
 	$(foreach o,name build duration,./support/scripts/graph-build-time \
@@ -806,12 +770,10 @@ graph-build: $(O)/build/build-time.log
 				   --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \
 				   $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))

-.PHONY: graph-depends-requirements
 graph-depends-requirements:
 	@dot -? >/dev/null 2>&1 || \
 		{ echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; }

-.PHONY: graph-depends
 graph-depends: graph-depends-requirements
 	@$(INSTALL) -d $(GRAPHS_DIR)
 	@cd "$(CONFIG_DIR)"; \
@@ -821,7 +783,6 @@ graph-depends: graph-depends-requirements
 		-o $(GRAPHS_DIR)/$(@).$(BR_GRAPH_OUT) \
 		$(GRAPHS_DIR)/$(@).dot

-.PHONY: graph-size
 graph-size:
 	$(Q)mkdir -p $(GRAPHS_DIR)
 	$(Q)$(TOPDIR)/support/scripts/size-stats --builddir $(BASE_DIR) \
@@ -829,21 +790,13 @@ graph-size:
 		--file-size-csv $(GRAPHS_DIR)/file-size-stats.csv \
 		--package-size-csv $(GRAPHS_DIR)/package-size-stats.csv

-.PHONY: check-dependencies
 check-dependencies:
 	@cd "$(CONFIG_DIR)"; \
 	$(TOPDIR)/support/scripts/graph-depends -C

 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)

-# Some subdirectories are also package names. To avoid that "make linux"
-# on an unconfigured tree produces "Nothing to be done", add an explicit
-# rule for it.
-# Also for 'all' we error out and ask the user to configure first.
-.PHONY: linux toolchain
-linux toolchain all: outputmakefile
-	$(error Please configure Buildroot first (e.g. "make menuconfig"))
-	@exit 1
+all: menuconfig

 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)

@@ -895,20 +848,50 @@ config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 # no values are set for the legacy options so a subsequent oldconfig
 # will query them. Therefore, run an additional olddefconfig.

-randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --$@ $(CONFIG_CONFIG_IN)
+oldconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@$(COMMON_CONFIG_ENV) $< --oldconfig $(CONFIG_CONFIG_IN)
+
+randconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --randconfig $(CONFIG_CONFIG_IN)
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null

-randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+allyesconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --allyesconfig $(CONFIG_CONFIG_IN)
+	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
+
+allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --allnoconfig $(CONFIG_CONFIG_IN)
+	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
+
+randpackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
-		$< --$(subst package,,$@) $(CONFIG_CONFIG_IN)
+		$< --randconfig $(CONFIG_CONFIG_IN)
 	@rm -f $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null

-oldconfig silentoldconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@$(COMMON_CONFIG_ENV) $< --$@ $(CONFIG_CONFIG_IN)
+allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
+	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
+		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
+		$< --allyesconfig $(CONFIG_CONFIG_IN)
+	@rm -f $(CONFIG_DIR)/.config.nopkg
+	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
+
+allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
+	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
+		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
+		$< --allnoconfig $(CONFIG_CONFIG_IN)
+	@rm -f $(CONFIG_DIR)/.config.nopkg
+	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
+
+silentoldconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	$(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN)
+
+olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN)

 defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
@@ -938,7 +921,6 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 # outputmakefile generates a Makefile in the output directory, if using a
 # separate output directory. This allows convenient use of make in the
 # output directory.
-.PHONY: outputmakefile
 outputmakefile:
 ifeq ($(NEED_WRAPPER),y)
 	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
@@ -955,9 +937,8 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
 # Makefiles. Alternatively, if a non-empty VARS variable is passed,
 # only the variables matching the make pattern passed in VARS are
 # displayed.
-.PHONY: printvars
 printvars:
-	@:$(foreach V, \
+	@$(foreach V, \
 		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
@@ -966,13 +947,11 @@ printvars:
 			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
 # ' Syntax colouring...

-.PHONY: clean
 clean:
 	rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
 		$(BUILD_DIR) $(BASE_DIR)/staging \
 		$(LEGAL_INFO_DIR) $(GRAPHS_DIR)

-.PHONY: distclean
 distclean: clean
 ifeq ($(O),$(CURDIR)/output)
 	rm -rf $(O)
@@ -980,7 +959,6 @@ endif
 	rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \
 		$(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE)

-.PHONY: help
 help:
 	@echo 'Cleaning:'
 	@echo '  clean                  - delete all files created by build'
@@ -989,7 +967,6 @@ help:
 	@echo 'Build:'
 	@echo '  all                    - make world'
 	@echo '  toolchain              - build toolchain'
-	@echo '  sdk                    - build relocatable SDK'
 	@echo
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
@@ -1005,7 +982,6 @@ help:
 	@echo '  savedefconfig          - Save current config to BR2_DEFCONFIG (minimal config)'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'
-	@echo '  alldefconfig           - New config where all options are set to default'
 	@echo '  randpackageconfig      - New config with random answer to package options'
 	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
 	@echo '  allnopackageconfig     - New config where package options are answered with no'
@@ -1079,7 +1055,6 @@ endef

 # We iterate over BR2_EXTERNAL_NAMES rather than BR2_EXTERNAL_DIRS,
 # because we want to display the name of the br2-external tree.
-.PHONY: list-defconfigs
 list-defconfigs:
 	$(call list-defconfigs,$(TOPDIR))
 	$(foreach name,$(BR2_EXTERNAL_NAMES),\
@@ -1102,14 +1077,11 @@ release:
 print-version:
 	@echo $(BR2_VERSION_FULL)

-.PHONY: .gitlab-ci.yml
-.gitlab-ci.yml: .gitlab-ci.yml.in
-	cp $< $@
-	(cd configs; LC_ALL=C ls -1 *_defconfig) | sed 's/$$/: *defconfig/' >> $@
-	./support/testing/run-tests -l 2>&1 | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: *runtime_test/' | LC_ALL=C sort >> $@
+.gitlab-ci.yml: .gitlab-ci.yml.in configs/*_defconfig
+	(cd configs; LC_ALL=C ls -1 *_defconfig) | sed 's/$$/: *defconfig/' | cat $< - > $@

 include docs/manual/manual.mk
-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk)))
+-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk)

 .PHONY: $(noconfig_targets)

--- a/arch/Config.in
+++ b/arch/Config.in
@@ -87,7 +87,6 @@ config BR2_bfin

 config BR2_csky
 	bool "csky"
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
 	  csky is processor IP from china.
@@ -251,16 +250,6 @@ config BR2_xtensa

 endchoice

-# For some architectures or specific cores, our internal toolchain
-# backend is not suitable (like, missing support in upstream gcc, or
-# no ChipCo fork exists...)
-config BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	bool
-
-config BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
-	bool
-	default y if !BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -275,12 +264,6 @@ config BR2_GCC_TARGET_ARCH
 config BR2_GCC_TARGET_ABI
 	string

-config BR2_GCC_TARGET_NAN
-	string
-
-config BR2_GCC_TARGET_FP32_MODE
-	string
-
 config BR2_GCC_TARGET_CPU
 	string

--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -182,15 +182,6 @@ config BR2_cortex_a15
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	depends on !BR2_ARCH_IS_64
-config BR2_cortex_a15_a7
-	bool "cortex-A15/A7 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_NEON
-	select BR2_ARM_CPU_HAS_VFPV4
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_ARMV7A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a17
 	bool "cortex-A17"
 	select BR2_ARM_CPU_HAS_ARM
@@ -200,15 +191,6 @@ config BR2_cortex_a17
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	depends on !BR2_ARCH_IS_64
-config BR2_cortex_a17_a7
-	bool "cortex-A17/A7 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_NEON
-	select BR2_ARM_CPU_HAS_VFPV4
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_ARMV7A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a53
 	bool "cortex-A53"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -225,14 +207,6 @@ config BR2_cortex_a57
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-config BR2_cortex_a57_a53
-	bool "cortex-A57/A53 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a72
 	bool "cortex-A72"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -241,14 +215,6 @@ config BR2_cortex_a72
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-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_ARMV8
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_m3
 	bool "cortex-M3"
 	select BR2_ARM_CPU_HAS_THUMB2
@@ -560,9 +526,7 @@ config BR2_GCC_TARGET_CPU
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a12"	if BR2_cortex_a12
 	default "cortex-a15"	if BR2_cortex_a15
-	default "cortex-a15.cortex-a7"	if BR2_cortex_a15_a7
 	default "cortex-a17"	if BR2_cortex_a17
-	default "cortex-a17.cortex-a7"	if BR2_cortex_a17_a7
 	default "cortex-m3"	if BR2_cortex_m3
 	default "cortex-m4"	if BR2_cortex_m4
 	default "fa526"		if BR2_fa526
@@ -572,9 +536,7 @@ config BR2_GCC_TARGET_CPU
 	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

 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"	if BR2_arm || BR2_armeb
--- a/arch/Config.in.bfin
+++ b/arch/Config.in.bfin
@@ -4,6 +4,14 @@ choice
 	default BR2_bf532
 	help
 	  Specify target CPU
+config BR2_bf606
+	bool "bf606"
+config BR2_bf607
+	bool "bf607"
+config BR2_bf608
+	bool "bf608"
+config BR2_bf609
+	bool "bf609"
 config BR2_bf512
 	bool "bf512"
 config BR2_bf514
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -1,26 +1,20 @@
 # mips default CPU ISAs
 config BR2_MIPS_CPU_MIPS32
 	bool
-	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS32R2
 	bool
-	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS32R5
 	bool
 config BR2_MIPS_CPU_MIPS32R6
 	bool
-	select BR2_MIPS_NAN_2008
 config BR2_MIPS_CPU_MIPS64
 	bool
-	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS64R2
 	bool
-	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS64R5
 	bool
 config BR2_MIPS_CPU_MIPS64R6
 	bool
-	select BR2_MIPS_NAN_2008

 choice
 	prompt "Target Architecture Variant"
@@ -57,17 +51,14 @@ config BR2_mips_m5150
 	bool "M5150"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R5
-	select BR2_MIPS_NAN_2008
 config BR2_mips_m6250
 	bool "M6250"
 	depends on !BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_MIPS_CPU_MIPS32R6
 config BR2_mips_p5600
 	bool "P5600"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R5
-	select BR2_MIPS_NAN_2008
 config BR2_mips_xburst
 	bool "XBurst"
 	depends on !BR2_ARCH_IS_64
@@ -104,7 +95,6 @@ config BR2_mips_i6400
 config BR2_mips_p6600
 	bool "P6600"
 	depends on BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_MIPS_CPU_MIPS64R6
 endchoice

@@ -136,64 +126,6 @@ config BR2_MIPS_SOFT_FLOAT
 	  floating point functions, then everything will need to be
 	  compiled with soft floating point support (-msoft-float).

-choice
-	prompt "FP mode"
-	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
-	default BR2_MIPS_FP32_MODE_XX if BR2_TOOLCHAIN_HAS_MFPXX_OPTION
-	help
-	  MIPS32 supports different FP modes (32,xx,64). Information about FP
-	  modes can be found here:
-	  https://sourceware.org/binutils/docs/as/MIPS-Options.html
-	  https://dmz-portal.imgtec.com/wiki/MIPS_O32_ABI_-_FR0_and_FR1_Interlinking#5._Generating_modeless_code
-
-config BR2_MIPS_FP32_MODE_32
-	bool "32"
-	depends on !BR2_MIPS_CPU_MIPS32R6
-
-config BR2_MIPS_FP32_MODE_XX
-	bool "xx"
-	depends on BR2_TOOLCHAIN_HAS_MFPXX_OPTION
-
-config BR2_MIPS_FP32_MODE_64
-	bool "64"
-	depends on !BR2_MIPS_CPU_MIPS32
-endchoice
-
-config BR2_GCC_TARGET_FP32_MODE
-	default "32"	if BR2_MIPS_FP32_MODE_32
-	default "xx"	if BR2_MIPS_FP32_MODE_XX
-	default "64"	if BR2_MIPS_FP32_MODE_64
-
-config BR2_MIPS_NAN_LEGACY
-	bool
-
-config BR2_MIPS_NAN_2008
-	bool
-
-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
-	  MIPS supports two different NaN encodings, legacy and 2008.
-	  Information about MIPS NaN encodings can be found here:
-	  https://sourceware.org/binutils/docs/as/MIPS-NaN-Encodings.html
-
-config BR2_MIPS_ENABLE_NAN_LEGACY
-	bool "legacy"
-	select BR2_MIPS_NAN_LEGACY
-
-config BR2_MIPS_ENABLE_NAN_2008
-	bool "2008"
-	depends on !BR2_MIPS_SOFT_FLOAT
-	select BR2_MIPS_NAN_2008
-endchoice
-
-config BR2_GCC_TARGET_NAN
-	default "legacy"	if BR2_MIPS_NAN_LEGACY
-	default "2008"		if BR2_MIPS_NAN_2008
-
 config BR2_ARCH
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -2,32 +2,39 @@ choice
 	prompt "Target Architecture Variant"
 	depends on BR2_xtensa
 	default BR2_xtensa_fsf
-
 config BR2_XTENSA_CUSTOM
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	bool "Custom Xtensa processor configuration"
-
 config BR2_xtensa_fsf
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	bool "fsf - Default configuration"
-
 endchoice

-config BR2_XTENSA_OVERLAY_FILE
-	string "Overlay file for custom configuration"
+config BR2_XTENSA_CUSTOM_NAME
+	string "Custom Xtensa processor configuration name"
 	depends on BR2_XTENSA_CUSTOM
+	default ""
 	help
-	  Enter the path to the overlay tarball for a custom processor
-	  configuration.
+	  Name given to a custom Xtensa processor configuration.

+config BR2_XTENSA_CORE_NAME
+	string
+	default BR2_XTENSA_CUSTOM_NAME	if BR2_XTENSA_CUSTOM
+	default ""			if BR2_xtensa_fsf
+
+config BR2_XTENSA_OVERLAY_DIR
+	string "Overlay directory for custom configuration"
+	depends on BR2_XTENSA_CUSTOM
+	default ""
+	help
+	  Provide the directory path that contains the overlay file
+	  for a custom processor configuration. The path is relative
+	  to the top directory of buildroot.
 	  These overlay files are tar packages with updated configuration
 	  files for various toolchain packages and Xtensa processor
 	  configurations. They are provided by the processor vendor or
 	  directly from Tensilica.

-	  The path can be either absolute, or relative to the top directory
-	  of buildroot.
-
 choice
 	prompt "Target Architecture Endianness"
 	depends on BR2_XTENSA_CUSTOM
--- a/arch/arch.mk.xtensa
+++ b/arch/arch.mk.xtensa
@@ -1,36 +1,28 @@
 ################################################################################
-# This variable can be used by packages that need to extract the overlay.
+# Those two variables can be used by packages that need to extract the overlay.
 #
-# ARCH_XTENSA_OVERLAY_FILE is the path to the overlay tarball; empty if not
-#                          using any overlay
+# ARCH_XTENSA_CORE_NAME   is the name of the Xtensa core; empty if none or the
+#                         standard 'fsf' core.
+# ARCH_XTENSA_OVERLAY_TAR is the path to the overlay tarball; only valid when
+#                         ARCH_XTENSA_CORE_NAME is not empty.
 #
 # Example:
-#   ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
-#       tar xf $(ARCH_XTENSA_OVERLAY_FILE) -C $(@D) --strip-components=1 gcc
+#   ifneq ($(ARCH_XTENSA_CORE_NAME),)
+#       tar xf $(ARCH_XTENSA_OVERLAY_TAR) -C $(@D) --strip-components=1 gcc
 #   endif
 ################################################################################
-BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE))
-ifneq ($(filter http://% https://% ftp://% scp://%,$(BR_ARCH_XTENSA_OVERLAY_FILE)),)
-ARCH_XTENSA_OVERLAY_URL = $(BR_ARCH_XTENSA_OVERLAY_FILE)
-ARCH_XTENSA_OVERLAY_FILE = $(DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE))
-# Do not check that file, we can't know its hash
-BR_NO_CHECK_HASH_FOR += $(notdir $(ARCH_XTENSA_OVERLAY_URL))
-else
-ARCH_XTENSA_OVERLAY_FILE = $(BR_ARCH_XTENSA_OVERLAY_FILE)
-endif
+ARCH_XTENSA_CORE_NAME = $(call qstrip,$(BR2_XTENSA_CORE_NAME))
+ARCH_XTENSA_OVERLAY_TAR = $(call qstrip,$(BR2_XTENSA_OVERLAY_DIR))/xtensa_$(ARCH_XTENSA_CORE_NAME).tar

 ################################################################################
 # arch-xtensa-overlay-extract -- extract an extensa overlay
 #
 # argument 1 is the path in which to extract
-# argument 2 is the component to extract, one of: gcc, binutils, gdb, linux,
-#            u-boot
+# argument 2 is the component to extract, one of: gcc, binutils, gdb
 #
 # Example:
 #   $(call arch-xtensa-overlay-extract,/path/to/overlay.tar,$(@D),gcc)
 ################################################################################
 define arch-xtensa-overlay-extract
-	$(call suitable-extractor,$(ARCH_XTENSA_OVERLAY_FILE)) \
-		$(ARCH_XTENSA_OVERLAY_FILE) | \
-	$(TAR) --strip-components=1 -C $(1) $(TAR_OPTIONS) - $(2)
+	tar xf $(ARCH_XTENSA_OVERLAY_TAR) -C $(1) --strip-components=1 $(2)
 endef
--- a/board/altera/socrates_cyclone5/boot-env.txt
+++ b/board/altera/socrates_cyclone5/boot-env.txt
@@ -1,8 +0,0 @@
-linux_load_address=0x100000
-linux_dtb_load_address=0x100
-linux_dtb=socfpga_cyclone5_socrates.dtb
-linux_load=mmc rescan; fatload mmc 0:1 ${linux_load_address} zImage; fatload mmc 0:1 ${linux_dtb_load_address} ${linux_dtb}
-bootargs=console=ttyS0,115200 root=/dev/mmcblk0p3 ro rootwait
-source_env=fatload mmc 0:1 0x2000000 boot.scr; source 0x2000000
-bootcmd=run linux_load; bootz ${linux_load_address} - ${linux_dtb_load_address}
-bootdelay=1
--- a/board/altera/socrates_cyclone5/genimage.cfg
+++ b/board/altera/socrates_cyclone5/genimage.cfg
@@ -1,58 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"socfpga_cyclone5_socrates.dtb"
-		}
-	}
-	size = 8M
-}
-
-image uboot.img {
-	hdimage {
-		partition-table = "no"
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "u-boot-spl.bin.crc"
-		offset = 0
-		size = 64k
-	}
-
-	partition uboot-full {
-		in-partition-table = "no"
-		image = "u-boot.img"
-		offset = 256k
-	}
-
-	size = 1M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition uboot-env {
-		in-partition-table = "no"
-		image = "uboot-env.bin"
-		offset = 17408 # 512 * 34 -> just after gpt
-	}
-
-	partition boot {
-		partition-type = 0xc
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition uboot {
-		partition-type = 0xa2
-		image = "uboot.img"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-		size = 500M
-	}
-}
--- a/board/altera/socrates_cyclone5/readme.txt
+++ b/board/altera/socrates_cyclone5/readme.txt
@@ -1,52 +0,0 @@
-EBV SoCrates Evaluation Board
-
-Intro
-=====
-
-More information about this board can be found here:
-https://rocketboards.org/foswiki/Documentation/EBVSoCratesEvaluationBoard
-
-Build
-=====
-
-First, load socrates config for buildroot
-
-    make socrates_cyclone5_defconfig
-
-Build everything
-
-    make
-
-Following files will be generated in output/images
-
-.
-├── boot.vfat
-├── rootfs.ext2
-├── rootfs.ext4 -> rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-├── socfpga_cyclone5_socrates.dtb
-├── u-boot-spl.bin
-├── u-boot-spl.bin.crc
-├── u-boot.bin
-├── u-boot.img
-├── uboot-env.bin
-├── uboot.img
-└── zImage
-
-
-Creating bootable SD card
-=========================
-
-Simply invoke
-
-dd if=output/images/sdcard.img of=/dev/sdX
-
-Where X is your SD card device (not partition)
-
-Booting
-=======
-
-Pins 6:8 on P18 selector is used to determine boot device. To boot socrates from
-sdcard set these pins to value 0x5 (101b). Remaining pins are used to determine
-how to configure FPGA and are not associated with booting into Linux kernel.
--- a/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch
+++ b/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch
@@ -1,53 +0,0 @@
-From 35b7ce4f8f290794d3b89db7461e8c568b5defa1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Apr 2016 09:19:17 -0700
-Subject: powerpc/ptrace: Fix out of bounds array access warning
-
-commit 1e407ee3b21f981140491d5b8a36422979ca246f upstream.
-
-gcc-6 correctly warns about a out of bounds access
-
-arch/powerpc/kernel/ptrace.c:407:24: warning: index 32 denotes an offset greater than size of 'u64[32][1] {aka long long unsigned int[32][1]}' [-Warray-bounds]
-        offsetof(struct thread_fp_state, fpr[32][0]));
-                        ^
-
-check the end of array instead of beginning of next element to fix this
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Kees Cook <keescook@chromium.org>
-Cc: Michael Ellerman <mpe@ellerman.id.au>
-Cc: Segher Boessenkool <segher@kernel.crashing.org>
-Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
-Acked-by: Olof Johansson <olof@lixom.net>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Oleksandr Zhadan <oleks@arcturusnetworks.com>
---
- arch/powerpc/kernel/ptrace.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index f21897b..93f200f 100644
--- a/arch/powerpc/kernel/ptrace.c
-+++ b/arch/powerpc/kernel/ptrace.c
-@@ -376,7 +376,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
- 
- #else
- 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
-		     offsetof(struct thread_fp_state, fpr[32][0]));
-+		     offsetof(struct thread_fp_state, fpr[32]));
- 
- 	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
- 				   &target->thread.fp_state, 0, -1);
-@@ -404,7 +404,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,
- 	return 0;
- #else
- 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
-		     offsetof(struct thread_fp_state, fpr[32][0]));
-+		     offsetof(struct thread_fp_state, fpr[32]));
- 
- 	return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
- 				  &target->thread.fp_state, 0, -1);
-- 
-cgit v1.1
--- a/board/armadeus/apf27/linux-3.18.config
+++ b/board/armadeus/apf27/linux-3.18.config
@@ -33,7 +33,9 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
 CONFIG_CAN=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_MCP251X=m
@@ -82,13 +84,13 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_SMSC_PHY=y
+CONFIG_RTL8187=m
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_RT2X00=m
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
-CONFIG_RTL8187=m
 CONFIG_RTL8192CU=m
 CONFIG_ZD1211RW=m
 CONFIG_INPUT_JOYDEV=y
@@ -123,7 +125,11 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_PWC=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_SOC_CAMERA=m
+CONFIG_VIDEO_MX2=m
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
 CONFIG_FB=y
 # CONFIG_FB_MX3 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -151,6 +157,7 @@ CONFIG_USB_PRINTER=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_DEBUG=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_FTDI_SIO=y
 CONFIG_USB_SERIAL_PL2303=y
@@ -178,8 +185,8 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1374=y
 CONFIG_RTC_DRV_MXC=m
 CONFIG_DMADEVICES=y
-CONFIG_IMX_DMA=y
 CONFIG_IMX_SDMA=y
+CONFIG_IMX_DMA=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
 CONFIG_MAX1027=y
@@ -212,5 +219,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
--- a/board/armadeus/readme.txt
+++ b/board/armadeus/readme.txt
@@ -13,6 +13,7 @@ Supported platforms
 Buildroot currently supports the following Armadeus platforms with the
 associated defconfigs:

+ * APF9328 SOM + devt boards -> armadeus_apf9328_defconfig
 * APF27 SOM + devt board    -> armadeus_apf27_defconfig
 * APF51 SOM + devt board    -> armadeus_apf51_defconfig
 * APF28 SOM + devt board    -> armadeus_apf28_defconfig
@@ -45,12 +46,15 @@ When the build is finished, you will end up with:

    output/images/
    ├── imx**-apfxxdev.dtb	[1]
+    ├── rootfs.jffs2		[2]
    ├── rootfs.tar
-    ├── rootfs.ubi
-    ├── rootfs.ubifs
+    ├── rootfs.ubi		[2]
+    ├── rootfs.ubifs		[2]
    └── uImage

 [1] Only if the kernel version used uses a Device Tree.
+[2] .ubi/.ubifs images are not available on APF9328 and replaced by a
+    .jffs2 one in this case.

 Building U-Boot is currently not supported in these configurations.

@@ -65,6 +69,7 @@ it:
  $ cp output/images/uImage /tftpboot/apfxx-linux.bin
  $ cp output/images/*.dtb /tftpboot/
  $ cp output/images/rootfs.ubi /tftpboot/apfxx-rootfs.ubi
+  $ cp output/images/rootfs.jffs2 /tftpboot/apfxx-rootfs.jffs2

 where "apfxx" is the version of your SOM, as used with _defconfigs.

--- a/board/atmel/at91sam9x5ek_mmc/genimage.cfg
+++ b/board/atmel/at91sam9x5ek_mmc/genimage.cfg
@@ -12,10 +12,6 @@ image boot.vfat {
 			"boot.bin",
 			"u-boot.bin"
 		}
-
-		file uboot.env {
-			image = "uboot-env.bin"
-		}
 	}
 	size = 16M
 }
--- a/board/atmel/at91sam9x5ek_mmc/uboot-env.txt
+++ b/board/atmel/at91sam9x5ek_mmc/uboot-env.txt
@@ -1,7 +0,0 @@
-bootargs=console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait video=Unknown-1:800x480-16
-bootcmd=fatload mmc 0:1 0x21000000 at91sam9g35ek.dtb; fatload mmc 0:1 0x22000000 zImage; bootz 0x22000000 - 0x21000000
-bootdelay=1
-ethact=gmac0
-stderr=serial
-stdin=serial
-stdout=serial
--- a/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg
+++ b/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg
@@ -1,34 +0,0 @@
-# Image for SD card boot on Atmel SAMA5D2 Xplained boards
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"at91-sama5d27_som1_ek.dtb",
-			"at91-sama5d27_som1_ek_pda4.dtb",
-			"at91-sama5d27_som1_ek_pda7.dtb",
-			"at91-sama5d27_som1_ek_pda7b.dtb",
-			"boot.bin",
-			"u-boot.bin"
-		}
-	}
-	size = 16M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 1M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/bananapi/bananapi-m1/boot.cmd
+++ b/board/bananapi/bananapi-m1/boot.cmd
@@ -1,7 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-mmc dev 0
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/bananapi/bananapi-m1/genimage.cfg
+++ b/board/bananapi/bananapi-m1/genimage.cfg
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun7i-a20-bananapi.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/bananapi/bananapi-m1/readme.txt
+++ b/board/bananapi/bananapi-m1/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Bananapi M1. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Bananapi M1 link:
-http://www.banana-pi.org/m1.html
-
-Wiki link:
-https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make bananapi_m1_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Bananapi M1 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/beaglebone/genimage_linux41.cfg
+++ b/board/beaglebone/genimage_linux41.cfg
@@ -1,32 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"MLO",
-			"u-boot.img",
-			"zImage",
-			"uEnv.txt",
-			"am335x-evm.dtb",
-			"am335x-evmsk.dtb",
-			"am335x-bone.dtb",
-			"am335x-boneblack.dtb",
-		}
-	}
-	size = 16M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		partition-type = 0xC
-		bootable = "true"
-                image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/beaglebone/post-image.sh
+++ b/board/beaglebone/post-image.sh
@@ -8,15 +8,7 @@ BOARD_DIR="$(dirname $0)"
 # copy the uEnv.txt to the output/images directory
 cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt

-# the 4.1 kernel does not provide a dtb for beaglebone green, so we
-# use a different genimage config if am335x-bonegreen.dtb is not
-# built:
-if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then
-	GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-else
-	GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg"
-fi
-
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

 rm -rf "${GENIMAGE_TMP}"
--- a/board/boundarydevices/common/6x_bootscript.txt
+++ b/board/boundarydevices/common/6x_bootscript.txt
@@ -106,7 +106,6 @@ 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
--- a/board/boundarydevices/common/post-build.sh
+++ b/board/boundarydevices/common/post-build.sh
@@ -8,13 +8,13 @@
 BOARD_DIR="$(dirname $0)"

 # bd u-boot looks for bootscript here
-$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
 -n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript

 # u-boot / update script for bd upgradeu command
 if [ -e $BINARIES_DIR/u-boot.imx ];
 then
    install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx
-    $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+    $HOST_DIR/usr/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/chromebook/snow/mksd.sh
+++ b/board/chromebook/snow/mksd.sh
@@ -14,8 +14,8 @@
 # cgpt does not create protective MBR, and the kernel refuses to read
 # GPT unless there's some kind of MBR in sector 0. So we need parted
 # to write that single sector before doing anything with the GPT.
-cgpt=$HOST_DIR/bin/cgpt
-parted=$HOST_DIR/sbin/parted
+cgpt=$HOST_DIR/usr/bin/cgpt
+parted=$HOST_DIR/usr/sbin/parted
 kernel=$BINARIES_DIR/uImage.kpart
 rootfs=$BINARIES_DIR/rootfs.ext2

--- a/board/chromebook/snow/readme.txt
+++ b/board/chromebook/snow/readme.txt
@@ -88,7 +88,7 @@ you will probably want the rootfs to occupy the whole remaining space.

 cgpt may be used to check current layout:

-	output/host/bin/cgpt show $SD
+	output/host/usr/bin/cgpt show $SD

 All sizes and all offsets are in 512-byte blocks.

--- a/board/chromebook/snow/sign.sh
+++ b/board/chromebook/snow/sign.sh
@@ -5,9 +5,9 @@
 # The resulting file is called uImage.kpart.

 BOARD_DIR=$(dirname $0)
-mkimage=$HOST_DIR/bin/mkimage
-futility=$HOST_DIR/bin/futility
-devkeys=$HOST_DIR/share/vboot/devkeys
+mkimage=$HOST_DIR/usr/bin/mkimage
+futility=$HOST_DIR/usr/bin/futility
+devkeys=$HOST_DIR/usr/share/vboot/devkeys

 run() { echo "$@"; "$@"; }
 die() { echo "$@" >&2; exit 1; }
--- a/board/csky/readme.txt
+++ b/board/csky/readme.txt
@@ -84,5 +84,5 @@ Run
  Setup the Console with the rate 115200/8-N-1.

  $ cd output/images
-  $ ../host/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux
+  $ ../host/usr/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux

--- a/board/cubietech/cubieboard2/post-build.sh
+++ b/board/cubietech/cubieboard2/post-build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# post-build.sh for Cubieboard2
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
+BOOT_CMD=$BOARD_DIR/boot.cmd
+BOOT_CMD_H=$BINARIES_DIR/boot.scr
+
+# U-Boot script
+$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
--- a/board/engicam/geam6ul/genimage.cfg
+++ b/board/engicam/geam6ul/genimage.cfg
@@ -1,38 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"uImage",
-			"imx6ul-geam-kit.dtb"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1024
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		image = "u-boot-dtb.img"
-		offset = 69K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
--- a/board/engicam/geam6ul/readme.txt
+++ b/board/engicam/geam6ul/readme.txt
@@ -1,66 +0,0 @@
-********************************************
-Buildroot for Engicam GEAM6UL SOM platforms:
-********************************************
-
-This file documents the Buildroot support for all Engicam GEAM6UL
-SOM platform boards.
-
-GEAM6UL SOM Starter kits:
-https://www.engicam.com/vis-prod/101115
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the Engicam GEAM6UL SOM:
-
- for GEAM6UL SOM:
-
-  make engicam_imx6ul_geam_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/:
-  - imx6ul-geam-kit.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - SPL
-  - u-boot-dtb.img
-  - uImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-  sync
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/engicam/geam6ul/genimage.cfg
-
-Boot the GEAM6UL boards with SD boot:
-====================================
-
-To boot your newly created system:
- insert the SD card in the SD slot of the board;
- connect 3-wire RS232 serial port J28 on board, and connect with other
-  serial end or USB cable(if serial-to-usb converter used) using
-  a terminal emulator at 115200 bps, 8n1;
- close JM3 for sd boot.
- power on the board.
-
-Enjoy!
--- a/board/engicam/icorem6/genimage.cfg
+++ b/board/engicam/icorem6/genimage.cfg
@@ -1,41 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"uImage",
-			"imx6dl-icore.dtb",
-			"imx6q-icore.dtb",
-			"imx6q-icore-ofcap10.dtb",
-			"imx6q-icore-ofcap12.dtb"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1024
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		image = "u-boot-dtb.img"
-		offset = 69K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
--- a/board/engicam/icorem6/linux_qt5.fragment
+++ b/board/engicam/icorem6/linux_qt5.fragment
@@ -1,4 +0,0 @@
-# Currently kernel mainline exhibits issues when running cpufreq as ondemand
-# governor on mx6.
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
--- a/board/engicam/icorem6/readme.txt
+++ b/board/engicam/icorem6/readme.txt
@@ -1,93 +0,0 @@
-*********************************************
-Buildroot for Engicam i.CoreM6 SOM platforms:
-*********************************************
-
-This file documents the Buildroot support for Engicam i.CoreM6
-platform boards.
-
-i.CoreM6 Quad/Dual/DualLite/Solo SOM Starter kits:
-https://www.engicam.com/vis-prod/101120
-i.CoreM6 Quad/Dual/DualLite/Solo Open Frame 10.1 C.TOUCH kits:
-https://www.engicam.com/vis-prod/101133
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the Engicam i.CoreM6:
-
-  make engicam_imx6qdl_icore_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/:
-  - imx6q-icore.dtb (for i.CoreM6 Quad/Dual)
-  - imx6dl-icore.dtb (for i.CoreM6 DualLite/Solo)
-  - imx6q-icore-ofcap10.dtb (for i.CoreM6 Quad/Dual ofcap 10)
-  - imx6q-icore-ofcap12.dtb (for i.CoreM6 Quad/Dual ofcap 12)
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - SPL
-  - u-boot-dtb.img
-  - uImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-  sync
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/engicam/icorem6/genimage.cfg
-
-Boot the i.CoreM6 boards with SD boot:
-=====================================
-
-To boot your newly created system:
- insert the SD card in the SD slot of the board;
- connect 3-wire RS232 serial port J28 on board, and connect with other
-  serial end or USB cable(if serial-to-usb converter used) using
-  a terminal emulator at 115200 bps, 8n1;
- close JM3 for sd boot.
- power on the board.
-
-Testing graphics on i.CoreM6:
-============================
-
-Build with support for Etnaviv, Qt5 and demo applications:
-
-  make engicam_imx6qdl_icore_qt5_defconfig
-  make
-
-Running kmscube
-# kmscube -D /dev/dri/card1
-
-Running glmark2-es2-drm
-# glmark2-es2-drm
-
-Running Qt5 Cinematic Demo:
- for i.CoreM6 Starter Kit
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore.json
- for i.CoreM6 ofcap10
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore-ofcap10.json
- for i.CoreM6 ofcap12
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore-ofcap12.json
-
-# CinematicExperience-demo
-
-Enjoy!
--- a/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json
+++ b/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json
@@ -1,11 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "LVDS-1",
-      "mode": "1280x800"
-    }
-  ]
-}
--- a/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json
+++ b/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json
@@ -1,11 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "LVDS-1",
-      "mode": "1280x480"
-    }
-  ]
-}
--- a/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json
+++ b/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json
@@ -1,11 +0,0 @@
-{
-  "device": "/dev/dri/card1",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "LVDS-1",
-      "mode": "800x480"
-    }
-  ]
-}
--- a/board/engicam/icorem6_rqs/genimage.cfg
+++ b/board/engicam/icorem6_rqs/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"uImage",
-			"imx6dl-icore-rqs.dtb",
-			"imx6q-icore-rqs.dtb"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1024
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		image = "u-boot-dtb.img"
-		offset = 69K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
--- a/board/engicam/icorem6_rqs/readme.txt
+++ b/board/engicam/icorem6_rqs/readme.txt
@@ -1,69 +0,0 @@
-*************************************************
-Buildroot for Engicam i.CoreM6 RQS SOM platforms:
-*************************************************
-
-This file documents the Buildroot support for Engicam i.CoreM6 RQS
-SOM platform boards.
-
-i.CoreM6 Quad/Dual/DualLite/Solo RQS SOM Starter kits:
-https://www.engicam.com/vis-prod/101124
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the Engicam i.CoreM6 RQS:
-
- for i.CoreM6 RQS Quad/Dual/DualLite/Solo:
-
-  make engicam_imx6qdl_icore_rqs_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/:
- for i.CoreM6 Quad/Dual RQS:
-  - imx6q-icore-rqs.dtb
- for i.CoreM6 DualLite/Solo RQS:
-  - imx6dl-icore-rqs.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - SPL
-  - u-boot-dtb.img
-  - uImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-  sync
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/engicam/icorem6_rqs/genimage.cfg
-
-Boot the i.CoreM6 RQS boards with SD boot:
-=========================================
-
-To boot your newly created system:
- insert the SD card in the SD slot of the board;
- connect 3-wire RS232 serial port J7 on board, and connect with other
-  serial end or USB cable(if serial-to-usb converter used) using
-  a terminal emulator at 115200 bps, 8n1;
- close JM2 for sd boot.
- power on the board.
-
-Enjoy!
--- a/board/engicam/isiot/genimage.cfg
+++ b/board/engicam/isiot/genimage.cfg
@@ -1,38 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"uImage",
-			"imx6ul-isiot-emmc.dtb"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1024
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		image = "u-boot-dtb.img"
-		offset = 69K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
--- a/board/engicam/isiot/readme.txt
+++ b/board/engicam/isiot/readme.txt
@@ -1,66 +0,0 @@
-********************************************
-Buildroot for Engicam Is.IoT SOM platforms:
-********************************************
-
-This file documents the Buildroot support for all Engicam Is.IoT MX6UL
-SOM platform boards.
-
-Is.IoT MX6UL SOM Starter kits:
-https://www.engicam.com/vis-prod/101122
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the Engicam Is.IoT MX6UL SOM:
-
- for Is.IoT MX6UL SOM:
-
-  make engicam_imx6ul_isiot_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/:
-  - imx6ul-isiot-emmc.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - SPL
-  - u-boot-dtb.img
-  - uImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-  sync
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/engicam/isiot/genimage.cfg
-
-Boot the Is.IoT MX6UL boards with SD boot:
-=========================================
-
-To boot your newly created system:
- insert the SD card in the SD slot of the board;
- connect 3-wire RS232 serial port J28 on board, and connect with other
-  serial end or USB cable(if serial-to-usb converter used) using
-  a terminal emulator at 115200 bps, 8n1;
- close JM3 for sd boot.
- power on the board.
-
-Enjoy!
--- a/board/firefly/firefly-rk3288/post-image.sh
+++ b/board/firefly/firefly-rk3288/post-image.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-MKIMAGE=$HOST_DIR/bin/mkimage
+MKIMAGE=$HOST_DIR/usr/bin/mkimage

 BOARD_DIR="$(dirname $0)"
 GENIMAGE_CFG="${BOARD_DIR}/sd-image.cfg"
--- a/board/freescale/common/imx/genimage.cfg.template_spl
+++ b/board/freescale/common/imx/genimage.cfg.template_spl
@@ -1,46 +0,0 @@
-# Minimal SD card image for the Freescale boards Template for SPL Boot
-#
-# We mimic the .sdcard Freescale's image format:
-# * the SD card must have 1 kB free space at the beginning,
-# * U-Boot is dumped as is,
-# * a FAT partition at offset 8MB is containing zImage/uImage and DTB files
-# * a single root filesystem partition is required (ext2, ext3 or ext4)
-#
-
-image boot.vfat {
-  vfat {
-    files = {
-      %FILES%
-    }
-  }
-  size = 16M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition spl {
-    in-partition-table = "no"
-    image = "SPL"
-    offset = 1024
-  }
-
-  partition u-boot-img {
-    in-partition-table = "no"
-    image = "u-boot.img"
-    offset = 69K
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-    offset = 8M
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-  }
-}
--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -28,15 +28,6 @@ linux_image()
 	fi
 }

-genimage_type()
-{
-	if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
-		echo "genimage.cfg.template_spl"
-	else
-		echo "genimage.cfg.template"
-	fi
-}
-
 main()
 {
 	local FILES="$(dtb_list) $(linux_image)"
@@ -44,7 +35,7 @@ main()
 	local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

 	sed -e "s/%FILES%/${FILES}/" \
-		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}
+		board/freescale/common/imx/genimage.cfg.template > ${GENIMAGE_CFG}

 	rm -rf "${GENIMAGE_TMP}"

--- a/board/freescale/imx6-sabresd/linux_qt5.fragment
+++ b/board/freescale/imx6-sabresd/linux_qt5.fragment
@@ -1,5 +0,0 @@
-# Currently mx6sabresd exhibits touchscreen issues when running cpufreq as
-# ondemand governor with a mainline kernel.
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-CONFIG_VIDEO_CODA=m
--- a/board/freescale/imx6-sabresd/readme.txt
+++ b/board/freescale/imx6-sabresd/readme.txt
@@ -1,110 +0,0 @@
-*******************************
-Freescale i.MX6 Sabre SD boards
-*******************************
-
-This file documents the Buildroot support for the Freescale i.MX6 Sabre SD
-boards based on i.MX6Q, i.MX6DL and iMX6QP.
-
-Thanks to the SPL support in U-Boot it is possible to run a single
-sdcard.img in all i.MX6 Sabre SD board variants.
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX6 Sabre SD board:
-
-  make imx6-sabresd_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/ :
-  - imx6q-sabresd.dtb
-  - imx6dl-sabresd.dtb
-  - imx6qp-sabresd.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.imx
-  - zImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template.
-
-Boot the i.MX6 Sabre SD board
-=============================
-
-To boot your newly created system:
- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
- power on the board.
-
-Testing graphics on the i.MX6 Sabre SD board
-============================================
-
-The imx6-sabresd_qt5_defconfig allows to quickly test the graphics
-capabilities of i.MX6 using the opensource Etnaviv graphics stack
-and kernel mainline.
-
-In order to build it:
-
-make imx6-sabresd_qt5_defconfig
-make
-
-Then flash the SD card as explained above.
-
-Running kmscube application:
-
-# kmscube
-
-Running Qt5 Cinematic Demo:
-
-# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
-# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
-
-Running gl2mark benchmark:
-
-# glmark2-es2-drm
-
-Testing video playback on the i.MX6 Sabre SD board
-==================================================
-
-As the mx6sabresd has two display outputs (LVDS and HDMI), it is necessary to
-know what is the connector that corresponds to the HDMI output.
-
-This information can be found by running:
-
-# modetest
-
-And search for the HDMI connector number. In our case it shows up as 37.
-
-In the mx6sabresd prompt run the following Gstreamer pipeline:
-
-# gst-launch-1.0 filesrc location=/root/trailer_1080p_h264_mp3.avi ! avidemux ! \
-h264parse ! v4l2video1dec capture-io-mode=dmabuf ! kmssink connector-id=37    \
-name=imx-drm sync=0
-
-(The video used on this example was retrieved from:
-http://linode.boundarydevices.com/videos/trailer_1080p_h264_mp3.avi)
-
-Enjoy!
--- a/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
+++ b/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
@@ -1,15 +0,0 @@
-{
-  "device": "/dev/dri/card0",
-  "hwcursor": false,
-  "pbuffers": true,
-  "outputs": [
-    {
-      "name": "HDMI-1",
-      "mode": "off"
-    },
-    {
-      "name": "LVDS-1",
-      "mode": "1024x768"
-    }
-  ]
-}
--- a/board/freescale/imx6q-sabresd/readme.txt
+++ b/board/freescale/imx6q-sabresd/readme.txt
@@ -0,0 +1,57 @@
+*******************************
+Freescale i.MX6Q Sabre SD board
+*******************************
+
+This file documents the Buildroot support for the Freescale i.MX6Q Sabre SD
+board.
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the i.MX6Q Sabre SD board:
+
+  make imx6q-sabresd_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/ :
+  - imx6q-sabresd.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - u-boot.imx
+  - zImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template.
+
+Boot the i.MX6Q Sabre SD board
+==============================
+
+To boot your newly created system:
+- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+  emulator at 115200 bps, 8n1;
+- power on the board.
+
+Enjoy!
--- a/board/freescale/imx6sabre/readme.txt
+++ b/board/freescale/imx6sabre/readme.txt
@@ -18,8 +18,8 @@ Read the SABRE for Automotive Infotainment Quick Start Guide for an
 introduction to the board:
 http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf

-Building with NXP kernel and NXP U-Boot
-=======================================
+Build
+=====

 First, configure Buildroot for your SABRE board.
 For i.MX6Q SABRE SD board:
@@ -54,27 +54,6 @@ You will find in ./output/images/ the following files:
  - u-boot.imx
  - uImage, or zImage for i.MX6 SoloX

-Building with mainline kernel and mainline U-Boot
-=================================================
-
-Mainline U-Boot uses SPL and can support the three
-variants of mx6sabreauto boards: mx6q, mx6dl and mx6qp.
-
-First, configure Buildroot for your mx6sabreauto board
-
-  make imx6-sabreauto_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - imx6dl-sabresd.dtb, imx6q-sabresd.dtb, imx6q-sabresd.dtb
-  - rootfs.ext2
-  - SPL and u-boot.img
-  - u-boot.imx
-  - zImage
-
 Create a bootable SD card
 =========================

--- a/board/freescale/warpboard/README
+++ b/board/freescale/warpboard/README
@@ -23,7 +23,7 @@ Update uboot

 - Load u-boot.imx in the WarpBoard by using the imx-usb-loader host utility:

-  $ ./output/host/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx
+  $ ./output/host/usr/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx

 - U-Boot will appear in minicom

@@ -36,7 +36,7 @@ Update uboot

 - Transfer U-Boot into flash by running this command in host side:

- $ sudo ./output/host/bin/dfu-util -D output/images/u-boot.imx -a boot
+ $ sudo ./output/host/usr/bin/dfu-util -D output/images/u-boot.imx -a boot

 - remove power and put the WarpBoard back into normal boot mode by
  opening the j2 jumper.
--- a/board/friendlyarm/nanopi-m1-plus/boot.cmd
+++ b/board/friendlyarm/nanopi-m1-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-nanopi-m1-plus.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/friendlyarm/nanopi-m1-plus/genimage.cfg
+++ b/board/friendlyarm/nanopi-m1-plus/genimage.cfg
@@ -1,35 +0,0 @@
-# Minimal SD card image for the NanoPi M1 Plus
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-nanopi-m1-plus.dtb",
-			"boot.scr"
-		}
-	}
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/friendlyarm/nanopi-m1-plus/readme.txt
+++ b/board/friendlyarm/nanopi-m1-plus/readme.txt
@@ -1,29 +0,0 @@
-NanoPi M1 Plus
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the NanoPi M1 Plus. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make nanopi_m1_plus_defconfig
-
-Compile everything and build the SD card image:
-
-    $ make
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
--- a/board/friendlyarm/nanopi-m1/boot.cmd
+++ b/board/friendlyarm/nanopi-m1/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-nanopi-m1.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/friendlyarm/nanopi-m1/genimage.cfg
+++ b/board/friendlyarm/nanopi-m1/genimage.cfg
@@ -1,36 +0,0 @@
-# Minimal SD card image for the NanoPi M1
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-nanopi-m1.dtb",
-			"boot.scr"
-		}
-	}
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/friendlyarm/nanopi-m1/readme.txt
+++ b/board/friendlyarm/nanopi-m1/readme.txt
@@ -1,29 +0,0 @@
-NanoPi M1
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the NanoPi M1. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make nanopi_m1_defconfig
-
-Compile everything and build the SD card image:
-
-    $ make
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
--- a/board/gdb/bfin-bf512/readme.txt
+++ b/board/gdb/bfin-bf512/readme.txt
@@ -1,10 +1,10 @@
 Run the simulation with GDB for FDPIC:

- ./output/host/bin/bfin-buildroot-linux-uclibc-run --env operating --model bf512 output/images/vmlinux
+ ./output/host/usr/bin/bfin-buildroot-linux-uclibc-run --env operating --model bf512 output/images/vmlinux

 Run the simulation with GDB for FLAT:

- ./output/host/bin/bfin-buildroot-uclinux-uclibc-run --env operating --model bf512 output/images/vmlinux
+ ./output/host/usr/bin/bfin-buildroot-uclinux-uclibc-run --env operating --model bf512 output/images/vmlinux

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

--- a/board/intel/galileo/linux-3.14.config
+++ b/board/intel/galileo/linux-3.14.config
@@ -28,7 +28,7 @@ CONFIG_EMBEDDED=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-CONFIG_LBDAF=y
+# CONFIG_LBDAF is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_ZONE_DMA is not set
--- a/board/lego/ev3/busybox.fragment
+++ b/board/lego/ev3/busybox.fragment
@@ -1,3 +0,0 @@
-CONFIG_BEEP=y
-CONFIG_FEATURE_BEEP_FREQ=440
-CONFIG_FEATURE_BEEP_LENGTH_MS=250
--- a/board/lego/ev3/genimage.cfg
+++ b/board/lego/ev3/genimage.cfg
@@ -19,7 +19,7 @@ image flash.bin {
 		size = 320K
 	}
 	partition uimage {
-		image = "uImage.da850-lego-ev3"
+		image = "uImage"
 		size = 3M
 		offset = 0x50000
 	}
@@ -34,8 +34,8 @@ image flash.bin {

 image boot.vfat {
 	vfat {
-		file uImage {
-			image = "uImage.da850-lego-ev3"
+		files = {
+			"uImage"
 		}
 	}
 	size = 16M
--- a/board/lego/ev3/linux.fragment
+++ b/board/lego/ev3/linux.fragment
@@ -1,55 +1,6 @@
-CONFIG_ARCH_DAVINCI_DM644x=n
-CONFIG_ARCH_DAVINCI_DM355=n
-CONFIG_ARCH_DAVINCI_DM646x=n
-CONFIG_ARCH_DAVINCI_DA830=n
-CONFIG_ARCH_DAVINCI_DM365=n
-CONFIG_MACH_SFFSDR=n
-CONFIG_MACH_NEUROS_OSD2=n
-CONFIG_MACH_DM355_LEOPARD=n
-CONFIG_MACH_MITYOMAPL138=n
-CONFIG_MACH_OMAPL138_HAWKBOARD=n
-CONFIG_MACH_DAVINCI_DA850_EVM=n
-CONFIG_ATA=n
-CONFIG_MTD=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1
 CONFIG_BLK_DEV_RAM_SIZE=32768
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_PWM_BEEPER=y
-CONFIG_SPI_DAVINCI=y
-CONFIG_PINCTRL_DA850_PUPD=y
-CONFIG_V4L_PLATFORM_DRIVERS=n
-CONFIG_SOUND=n
-CONFIG_SND=n
-CONFIG_SND_SOC=n
-CONFIG_SND_EDMA_SOC=n
-CONFIG_SND_DAVINCI_SOC_MCASP=n
-CONFIG_SND_SOC_TLV320AIC3X=n
-CONFIG_SND_SIMPLE_CARD=n
-CONFIG_DAVINCI_WATCHDOG=y
-CONFIG_USB=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_DAVINCI=y
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_DA8XX=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GADGET=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_DRV_OMAP=y
-CONFIG_IIO=y
-CONFIG_TI_ADS7950=y
-CONFIG_PWM_TIECAP=y
-CONFIG_PWM_TIEHRPWM=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
--- a/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch
+++ b/board/lego/ev3/patches/linux/0001-adc-device-tree-node.patch
@@ -1,56 +0,0 @@
-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
@@ -1,85 +0,0 @@
-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/readme.txt
+++ b/board/lego/ev3/readme.txt
@@ -13,6 +13,12 @@ See:
 - http://www.lego.com/en-us/mindstorms/products/ev3/31313-mindstorms-ev3/
 - http://www.ti.com/product/am1808

+The buildroot configuration uses the Linux kernel of the ev3dev project.
+See:
+- https://github.com/ev3dev/ev3-kernel/
+- https://github.com/ev3dev/lego-linux-drivers/
+- http://www.ev3dev.org/
+
 How it works
 ============

@@ -59,8 +65,7 @@ After building, you should obtain this tree:
    ├── rootfs.squashfs
    ├── sdcard.img
    ├── u-boot.bin
-    ├── uImage -> uImage.da850-lego-ev3
-    └── uImage.da850-lego-ev3
+    └── uImage

 Installation
 ============
--- a/board/lemaker/bananapro/patches/linux/0001-ARM-dts-sun7i-Enable-audio-codec-on-Banana-Pro.patch
+++ b/board/lemaker/bananapro/patches/linux/0001-ARM-dts-sun7i-Enable-audio-codec-on-Banana-Pro.patch
@@ -0,0 +1,35 @@
+From 1647fe31882a105cef4c99770e4ec8ea47c5c653 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
+Date: Wed, 4 Jan 2017 15:22:50 +0100
+Subject: [PATCH 1/1] ARM: dts: sun7i: Enable audio codec on Banana Pro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit enables the on-chip audio codec present on the A20 SoC
+on the Banana Pro board.
+
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+index 19d63d4049de..03799c647e13 100644
+--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+@@ -104,6 +104,10 @@
+ 	status = "okay";
+ };
+ 
+&codec {
+	status = "okay";
+};
+
+ &ehci0 {
+ 	status = "okay";
+ };
+-- 
+2.11.0
+
--- a/board/lemaker/bananapro/patches/linux/0002-ARM-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch
+++ b/board/lemaker/bananapro/patches/linux/0002-ARM-dts-sun7i-Add-wifi-dt-node-on-Banana-Pro.patch
@@ -0,0 +1,85 @@
+From f2cb904f074bc7e90be475488872a82270e9bae7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
+Date: Mon, 9 Jan 2017 21:36:38 +0100
+Subject: [PATCH 2/2] ARM: dts: sun7i: Add wifi dt node on Banana Pro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Banana Pro has an AMPAK AP6181 WiFi+Bluetooth module. The WiFi part
+is a BCM43362 IC connected to MMC3 of the A20 SoC via SDIO. The IC also
+takes a power enable signal via GPIO.
+
+This commit adds a device-tree node to power it up, so the mmc subsys
+can scan it, and enables the mmc controller which is connected to it.
+
+As the wifi enable pin of the AP6181 module is not really a regulator,
+switch the mmc3 node to the mmc-pwrseq framework for controlling it.
+This more accurately reflectes how the hardware actually works.
+
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 29 +++++++++++++++++------------
+ 1 file changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+index 03799c647e13..83516bc81225 100644
+--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+@@ -76,6 +76,13 @@
+ 		};
+ 	};
+ 
+	wifi_pwrseq: wifi-pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		pinctrl-names = "default";
+		pinctrl-0 = <&vmmc3_pin_bananapro>;
+		reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;
+	};
+
+ 	reg_gmac_3v3: gmac-3v3 {
+ 		compatible = "regulator-fixed";
+ 		pinctrl-names = "default";
+@@ -87,17 +94,6 @@
+ 		enable-active-high;
+ 		gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;
+ 	};
+-
+-	reg_vmmc3: vmmc3 {
+-		compatible = "regulator-fixed";
+-		pinctrl-names = "default";
+-		pinctrl-0 = <&vmmc3_pin_bananapro>;
+-		regulator-name = "vmmc3";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		enable-active-high;
+-		gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>;
+-	};
+ };
+ 
+ &ahci {
+@@ -170,10 +166,19 @@
+ &mmc3 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&mmc3_pins_a>;
+-	vmmc-supply = <&reg_vmmc3>;
+	vmmc-supply = <&reg_vcc3v3>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+ 	bus-width = <4>;
+ 	non-removable;
+ 	status = "okay";
+
+	brcmf: bcrmf@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&pio>;
+		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-names = "host-wake";
+	};
+ };
+ 
+ &ohci0 {
+-- 
+2.11.0
+
--- a/board/lemaker/bananapro/post-build.sh
+++ b/board/lemaker/bananapro/post-build.sh
@@ -4,7 +4,7 @@
 find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete

 BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/bin/mkimage
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
 BOOT_CMD=$BOARD_DIR/boot.cmd
 BOOT_CMD_H=$BINARIES_DIR/boot.scr

--- a/board/linksprite/pcduino/post-build.sh
+++ b/board/linksprite/pcduino/post-build.sh
@@ -3,7 +3,7 @@
 # 2013, Carlo Caione <carlo.caione@gmail.com>

 BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/bin/mkimage
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
 BOOT_CMD=$BOARD_DIR/boot.cmd
 BOOT_CMD_H=$BINARIES_DIR/boot.scr

--- a/board/minnowboard/linux-4.8.config
+++ b/board/minnowboard/linux-4.8.config
--- a/board/friendlyarm/nanopi-neo/boot.cmd
+++ b/board/friendlyarm/nanopi-neo/boot.cmd
--- a/board/friendlyarm/nanopi-neo/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo/genimage.cfg
--- a/board/friendlyarm/nanopi-neo/post-build.sh
+++ b/board/friendlyarm/nanopi-neo/post-build.sh
@@ -4,7 +4,7 @@
 # 2016, "Yann E. MORIN" <yann.morin.1998@free.fr>

 BOARD_DIR="$( dirname "${0}" )"
-MKIMAGE="${HOST_DIR}/bin/mkimage"
+MKIMAGE="${HOST_DIR}/usr/bin/mkimage"
 BOOT_CMD="${BOARD_DIR}/boot.cmd"
 BOOT_CMD_H="${BINARIES_DIR}/boot.scr"

--- a/board/friendlyarm/nanopi-neo/post-image.sh
+++ b/board/friendlyarm/nanopi-neo/post-image.sh
--- a/board/friendlyarm/nanopi-neo/readme.txt
+++ b/board/friendlyarm/nanopi-neo/readme.txt
--- a/board/nexbox/a95x/boot.txt
+++ b/board/nexbox/a95x/boot.txt
@@ -3,7 +3,7 @@ setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait
 fatload mmc 0:1 0x01080000 uImage

 if itest.s "${aml_dt}" == "gxl_p212_2g"; then
-	fatload mmc 0:1 $dtb_mem_addr meson-gxl-s905x-nexbox-a95x.dtb
+	fatload mmc 0:1 $dtb_mem_addr meson-gxl-nexbox-a95x.dtb
 else
 	fatload mmc 0:1 $dtb_mem_addr meson-gxbb-nexbox-a95x.dtb
 fi
--- a/board/nexbox/a95x/genimage.cfg
+++ b/board/nexbox/a95x/genimage.cfg
@@ -3,7 +3,7 @@ image boot.vfat {
 		files = {
 			"uImage",
 			"meson-gxbb-nexbox-a95x.dtb",
-			"meson-gxl-s905x-nexbox-a95x.dtb",
+			"meson-gxl-nexbox-a95x.dtb",
 			"boot.scr"
 		}
 	}
--- a/board/nexbox/a95x/post-build.sh
+++ b/board/nexbox/a95x/post-build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh

 BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/bin/mkimage
+MKIMAGE=$HOST_DIR/usr/bin/mkimage

 $MKIMAGE -C none -A arm64 -T script -d $BOARD_DIR/boot.txt $BINARIES_DIR/boot.scr

--- a/board/olimex/a13_olinuxino/boot.cmd
+++ b/board/olimex/a13_olinuxino/boot.cmd
@@ -1,7 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-mmc dev 0
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun5i-a13-olinuxino.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/olimex/a13_olinuxino/genimage.cfg
+++ b/board/olimex/a13_olinuxino/genimage.cfg
@@ -1,34 +0,0 @@
-image boot.vfat {
-        vfat {
-                files = {
-                        "zImage",
-                        "sun5i-a13-olinuxino.dtb",
-                        "boot.scr"
-                }
-        }
-        size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-        partition boot {
-                partition-type = 0xC
-                bootable = "true"
-                image = "boot.vfat"
-        }
-
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/olimex/a13_olinuxino/post-build.sh
+++ b/board/olimex/a13_olinuxino/post-build.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-MKIMAGE=$HOST_DIR/bin/mkimage
-
-$MKIMAGE -A arm -O linux -T script -C none \
-	 -d board/olimex/a13_olinuxino/boot.cmd \
-	 ${BINARIES_DIR}/boot.scr
--- a/board/olimex/a13_olinuxino/readme.txt
+++ b/board/olimex/a13_olinuxino/readme.txt
@@ -1,43 +0,0 @@
-A13-OLinuXino
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with
-the buildroot environment for the A13-OLinuXino. With the current
-configuration it will bring-up the board, and allow access through the
-serial console.
-
-For more details about the A13-OLinuXino:
-
-https://www.olimex.com/Products/OLinuXino/A13/A13-OLinuXino/open-source-hardware
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make olimex_a13_olinuxino_defconfig
-
-Compile everything and build the rootfs image:
-
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-The sdcard.img file is a complete bootable image ready to be written
-on the boot medium. To install it, simply copy the image to a micro SD
-card:
-
-    # dd if=output/images/sdcard.img of=/dev/sdX
-
-Notes:
-  - replace 'sdX' with the actual device with your micro SDcard,
-  - you may need to be root to do that (use 'sudo').
-
-Eject the SD card, insert it in the A13-OLinuXino board, and power it
-up.
--- a/board/olimex/a20_olinuxino/post-build.sh
+++ b/board/olimex/a20_olinuxino/post-build.sh
@@ -1,8 +1,12 @@
 #!/bin/sh
+# args from BR2_ROOTFS_POST_SCRIPT_ARGS
+# $2    path of boot.cmd
+# $3    output directory for boot.scr

-cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
+MKIMAGE=$HOST_DIR/usr/bin/mkimage
+
+$MKIMAGE -A arm -O linux -T script -C none -d $2 $3/boot.scr

 if [ -e $BINARIES_DIR/script.bin ]; then
-	# mali requires a legacy kernel
-	cp $BINARIES_DIR/script.bin $TARGET_DIR/boot/script.bin
+	cp $BINARIES_DIR/script.bin $3/script.bin
 fi
--- a/board/atmel/sama5d27_som1_ek_mmc/post-image.sh
+++ b/board/atmel/sama5d27_som1_ek_mmc/post-image.sh
@@ -6,9 +6,11 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"

 rm -rf "${GENIMAGE_TMP}"

-genimage                               \
+genimage                           \
 	--rootpath "${TARGET_DIR}"     \
 	--tmppath "${GENIMAGE_TMP}"    \
 	--inputpath "${BINARIES_DIR}"  \
 	--outputpath "${BINARIES_DIR}" \
 	--config "${GENIMAGE_CFG}"
+
+exit $?
--- a/board/openblocks/a6/readme.txt
+++ b/board/openblocks/a6/readme.txt
@@ -1,78 +0,0 @@
-Openblocks A6
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Openblocks A6. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make openblocks_a6_defconfig
-
-Compile everything:
-
-    $ make
-
-Updating board over TFTP
-========================
-
-Copy the content of output/images to the root of your TFTP server.
-
-Connect serial and ethernet, power up board and stop it in U-Boot:
-
-DRAM (DDR2) CAS Latency = 5 tRP = 5 tRAS = 14 tRCD=5
-DRAM CS[0] base 0x00000000   size 512MB
-DRAM Total size 512MB  16bit width
-Addresses 8M - 0M are saved for the U-Boot usage.
-Mem malloc Initialization (8M - 7M): Done
-NAND:64 MB
-POST:  mac verify Eth0 PASSED
-
-CPU : Marvell Feroceon (Rev 1)
-
-Streaming disabled
-Write allocate disabled
-
-
-USB 0: host mode
-Net:   egiga0
-Hit any key to stop autoboot:  0
-openblocks>>
-
-
-Load kernel from tftp:
-
-setenv serverip <tftp-server-ip>
-setenv bootfile uImage.kirkwood-openblocks_a6
-bootp && tftp
-
-
-Write it to nand:
-
-nand erase 0x590000 0x1c5c000
-nand write.e $loadaddr 0x590000 0x1c5c000
-
-
-Load rootfs from tftp:
-
-setenv serverip <tftp-server-ip>
-setenv bootfile rootfs.jffs2
-bootp && tftp
-
-
-Write it to nand:
-
-nand erase 0x2214000 0x1dc4000
-nand write.jffs2 $loadaddr 0x2214000 0x1dc4000
-
-
-Configure kernel to use rootfs:
-
-setenv root /dev/mtdblock5 rootfstype=jffs2
-saveenv
-boot
--- a/board/orangepi/orangepi-plus/boot.cmd
+++ b/board/orangepi/orangepi-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-plus.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-plus/genimage.cfg
+++ b/board/orangepi/orangepi-plus/genimage.cfg
@@ -1,35 +0,0 @@
-# Minimal SD card image for the OrangePi Plus\Plus2
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h3-orangepi-plus.dtb",
-			"boot.scr"
-		}
-	}
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/orangepi/orangepi-plus/readme.txt
+++ b/board/orangepi/orangepi-plus/readme.txt
@@ -1,29 +0,0 @@
-OrangePi Plus/Plus2
-
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the OrangePi Plus/Plus2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make orangepi_plus_defconfig
-
-Compile everything and build the SD card image:
-
-    $ make
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
--- a/board/orangepi/orangepi-zero/boot.cmd
+++ b/board/orangepi/orangepi-zero/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-h2-plus-orangepi-zero.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
--- a/board/orangepi/orangepi-zero/genimage.cfg
+++ b/board/orangepi/orangepi-zero/genimage.cfg
@@ -1,36 +0,0 @@
-# Minimal SD card image for the OrangePi Zero
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun8i-h2-plus-orangepi-zero.dtb",
-			"boot.scr"
-		}
-	}
-	size = 10M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/orangepi/orangepi-zero/linux-extras.config
+++ b/board/orangepi/orangepi-zero/linux-extras.config
@@ -1,17 +0,0 @@
-# spidev
-CONFIG_SPI_SPIDEV=y
-
-# spi nor
-CONFIG_MTD=y
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_M25P80=y
-
-# wireless core
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_CFG80211_WEXT=y
-
-# wireless drivers
-CONFIG_WLAN=y
--- a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
+++ b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
@@ -1,35 +0,0 @@
-From 321faaf4b78d46a0c77782c1798856746f0619e9 Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <geomatsi@gmail.com>
-Date: Fri, 19 May 2017 23:39:48 +0300
-Subject: [PATCH 1/3] ARM: dts: orange-pi-zero: specify XR819 WiFi chip
- interrupts
-
-The orange-pi-zero board has Allwinner XR819 SDIO wifi chip. The board
-dts file provides a node enabling mmc1 controller. Together with an
-out-of-tree driver https://github.com/fifteenhex/xradio this node
-enables using the wifi chip.
-
-This commit specifies XR819 interrupt configuration for the driver.
-
-Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
- arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-index b7ca916d871d..4e1a9050c6b4 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -125,6 +125,9 @@
- 	 */
- 	xr819: sdio_wifi@1 {
- 		reg = <1>;
-+		compatible = "xradio,xr819";
-+		interrupt-parent = <&pio>;
-+		interrupts = <6 10 IRQ_TYPE_EDGE_RISING>;
- 	};
- };
- 
-- 
-2.11.0
-
--- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
+++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
@@ -1,42 +0,0 @@
-From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <geomatsi@gmail.com>
-Date: Sat, 20 May 2017 11:24:26 +0300
-Subject: [PATCH 2/3] ARM: dts: orange-pi-zero: enable SPI NOR
-
-Enable SPI NOR on orange-pi-zero board.
-
-For more information see:
- http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash
-
-Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
- arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-index 4e1a9050c6b4..cdf19821b1f3 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -161,3 +161,19 @@
- 	/* USB VBUS is always on */
- 	status = "okay";
- };
-+
-+&spi0 {
-+	status = "okay";
-+
-+	flash@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
-+		reg = <0>;
-+		spi-max-frequency = <40000000>;
-+
-+		partition@00000000 {
-+			reg = <0x00000000 0x200000>;	/* 2Mb */
-+		};
-+	};
-+};
-- 
-2.11.0
-
--- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
+++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
@@ -1,42 +0,0 @@
-From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001
-From: Sergey Matyukevich <geomatsi@gmail.com>
-Date: Sat, 20 May 2017 15:36:51 +0300
-Subject: [PATCH 3/3] ARM: dts: orange-pi-zero: enable spidev
-
-On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port.
-This patch enables spidev driver for SPI1.
-
-Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
- arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-index cdf19821b1f3..7242aaecb14f 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
-@@ -59,6 +59,7 @@
- 		serial0 = &uart0;
- 		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
- 		ethernet1 = &xr819;
-+		spi1 = &spi1;
- 	};
- 
- 	chosen {
-@@ -177,3 +178,13 @@
- 		};
- 	};
- };
-+
-+&spi1 {
-+	status = "okay";
-+
-+	spidev@0 {
-+		compatible = "rohm,dh2228fv";
-+		reg = <0>;
-+		spi-max-frequency = <10000000>;
-+	};
-+};
-- 
-2.11.0
-
--- a/board/orangepi/orangepi-zero/post-build.sh
+++ b/board/orangepi/orangepi-zero/post-build.sh
@@ -1 +0,0 @@
-../post-build.sh
--- a/Show More
+++ b/Show More