Update for 2019.05.3

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/mongodb: security bump to version 4.0.12
2026-01-10 10:10:28 +03:00 · 2019-10-03 16:47:24 +02:00 · 2019-10-02 21:31:50 +02:00 · 2019-10-02 18:02:58 +02:00 · 2019-10-02 18:02:52 +02:00 · 2019-10-02 18:00:20 +02:00
4056 changed files with 40805 additions and 45646 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 # It needs to be regenerated every time a defconfig is added, using
 # "make .gitlab-ci.yml".

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

 .check_base:
    except:
@@ -160,7 +160,6 @@ bananapro_defconfig: { extends: .defconfig }
 beagleboardx15_defconfig: { extends: .defconfig }
 beaglebone_defconfig: { extends: .defconfig }
 beaglebone_qt5_defconfig: { extends: .defconfig }
-beagleboneai_defconfig: { extends: .defconfig }
 chromebook_snow_defconfig: { extends: .defconfig }
 ci20_defconfig: { extends: .defconfig }
 csky_gx6605s_defconfig: { extends: .defconfig }
@@ -177,7 +176,6 @@ freescale_imx6qsabreauto_defconfig: { extends: .defconfig }
 freescale_imx6qsabresd_defconfig: { extends: .defconfig }
 freescale_imx6sxsabresd_defconfig: { extends: .defconfig }
 freescale_imx7dsabresd_defconfig: { extends: .defconfig }
-freescale_imx8mmevk_defconfig: { extends: .defconfig }
 freescale_imx8mqevk_defconfig: { extends: .defconfig }
 freescale_imx8qxpmek_defconfig: { extends: .defconfig }
 freescale_p1025twr_defconfig: { extends: .defconfig }
@@ -185,11 +183,9 @@ freescale_t1040d4rdb_defconfig: { extends: .defconfig }
 freescale_t2080_qds_rdb_defconfig: { extends: .defconfig }
 friendlyarm_nanopi_a64_defconfig: { extends: .defconfig }
 friendlyarm_nanopi_neo2_defconfig: { extends: .defconfig }
-friendlyarm_nanopi_neo_plus2_defconfig: { extends: .defconfig }
 galileo_defconfig: { extends: .defconfig }
 grinn_chiliboard_defconfig: { extends: .defconfig }
 grinn_liteboard_defconfig: { extends: .defconfig }
-hifive_unleashed_defconfig: { extends: .defconfig }
 imx23evk_defconfig: { extends: .defconfig }
 imx6-sabreauto_defconfig: { extends: .defconfig }
 imx6-sabresd_defconfig: { extends: .defconfig }
@@ -200,9 +196,7 @@ imx6ulevk_defconfig: { extends: .defconfig }
 imx6ulpico_defconfig: { extends: .defconfig }
 imx7d-sdb_defconfig: { extends: .defconfig }
 imx7dpico_defconfig: { extends: .defconfig }
-imx8mmpico_defconfig: { extends: .defconfig }
 imx8mpico_defconfig: { extends: .defconfig }
-lafrite_defconfig: { extends: .defconfig }
 lego_ev3_defconfig: { extends: .defconfig }
 licheepi_zero_defconfig: { extends: .defconfig }
 linksprite_pcduino_defconfig: { extends: .defconfig }
@@ -222,13 +216,13 @@ nitrogen6sx_defconfig: { extends: .defconfig }
 nitrogen6x_defconfig: { extends: .defconfig }
 nitrogen7_defconfig: { extends: .defconfig }
 nitrogen8m_defconfig: { extends: .defconfig }
+odroidc2_defconfig: { extends: .defconfig }
 odroidxu4_defconfig: { extends: .defconfig }
 olimex_a10_olinuxino_lime_defconfig: { extends: .defconfig }
 olimex_a13_olinuxino_defconfig: { extends: .defconfig }
 olimex_a20_olinuxino_lime2_defconfig: { extends: .defconfig }
 olimex_a20_olinuxino_lime_defconfig: { extends: .defconfig }
 olimex_a20_olinuxino_micro_defconfig: { extends: .defconfig }
-olimex_a33_olinuxino_defconfig: { extends: .defconfig }
 olimex_a64_olinuxino_defconfig: { extends: .defconfig }
 olimex_imx233_olinuxino_defconfig: { extends: .defconfig }
 openblocks_a6_defconfig: { extends: .defconfig }
@@ -254,11 +248,6 @@ qemu_aarch64_virt_defconfig: { extends: .defconfig }
 qemu_arm_versatile_defconfig: { extends: .defconfig }
 qemu_arm_versatile_nommu_defconfig: { extends: .defconfig }
 qemu_arm_vexpress_defconfig: { extends: .defconfig }
-qemu_arm_vexpress_tz_defconfig: { extends: .defconfig }
-qemu_csky610_virt_defconfig: { extends: .defconfig }
-qemu_csky807_virt_defconfig: { extends: .defconfig }
-qemu_csky810_virt_defconfig: { extends: .defconfig }
-qemu_csky860_virt_defconfig: { extends: .defconfig }
 qemu_m68k_mcf5208_defconfig: { extends: .defconfig }
 qemu_m68k_q800_defconfig: { extends: .defconfig }
 qemu_microblazebe_mmu_defconfig: { extends: .defconfig }
@@ -277,7 +266,6 @@ qemu_ppc64_e5500_defconfig: { extends: .defconfig }
 qemu_ppc64_pseries_defconfig: { extends: .defconfig }
 qemu_ppc64le_pseries_defconfig: { extends: .defconfig }
 qemu_ppc_g3beige_defconfig: { extends: .defconfig }
-qemu_ppc_mac99_defconfig: { extends: .defconfig }
 qemu_ppc_mpc8544ds_defconfig: { extends: .defconfig }
 qemu_ppc_virtex_ml507_defconfig: { extends: .defconfig }
 qemu_riscv32_virt_defconfig: { extends: .defconfig }
@@ -296,7 +284,6 @@ raspberrypi2_defconfig: { extends: .defconfig }
 raspberrypi3_64_defconfig: { extends: .defconfig }
 raspberrypi3_defconfig: { extends: .defconfig }
 raspberrypi3_qt5we_defconfig: { extends: .defconfig }
-raspberrypi4_defconfig: { extends: .defconfig }
 raspberrypi_defconfig: { extends: .defconfig }
 riotboard_defconfig: { extends: .defconfig }
 rock64_defconfig: { extends: .defconfig }
@@ -311,13 +298,12 @@ snps_archs38_hsdk_defconfig: { extends: .defconfig }
 snps_archs38_vdk_defconfig: { extends: .defconfig }
 socrates_cyclone5_defconfig: { extends: .defconfig }
 solidrun_clearfog_defconfig: { extends: .defconfig }
-solidrun_clearfog_gt_8k_defconfig: { extends: .defconfig }
 solidrun_macchiatobin_mainline_defconfig: { extends: .defconfig }
 solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig }
 stm32f429_disco_defconfig: { extends: .defconfig }
 stm32f469_disco_defconfig: { extends: .defconfig }
-stm32mp157c_dk2_defconfig: { extends: .defconfig }
 toradex_apalis_imx6_defconfig: { extends: .defconfig }
+ts4800_defconfig: { extends: .defconfig }
 ts4900_defconfig: { extends: .defconfig }
 ts5500_defconfig: { extends: .defconfig }
 ts7680_defconfig: { extends: .defconfig }
@@ -339,7 +325,6 @@ tests.core.test_hardening.TestRelroPartial: { extends: .runtime_test }
 tests.core.test_hardening.TestSspNone: { extends: .runtime_test }
 tests.core.test_hardening.TestSspStrong: { extends: .runtime_test }
 tests.core.test_post_scripts.TestPostScripts: { extends: .runtime_test }
-tests.core.test_root_password.TestRootPassword: { extends: .runtime_test }
 tests.core.test_rootfs_overlay.TestRootfsOverlay: { extends: .runtime_test }
 tests.core.test_timezone.TestGlibcAllTimezone: { extends: .runtime_test }
 tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: { extends: .runtime_test }
@@ -383,16 +368,10 @@ tests.package.test_lsqlite3.TestLuaLsqlite3: { extends: .runtime_test }
 tests.package.test_lsqlite3.TestLuajitLsqlite3: { extends: .runtime_test }
 tests.package.test_lua.TestLua: { extends: .runtime_test }
 tests.package.test_lua.TestLuajit: { extends: .runtime_test }
-tests.package.test_lua_cqueues.TestLuaLuaCqueues: { extends: .runtime_test }
-tests.package.test_lua_cqueues.TestLuajitLuaCqueues: { extends: .runtime_test }
 tests.package.test_lua_curl.TestLuaLuacURL: { extends: .runtime_test }
 tests.package.test_lua_curl.TestLuajitLuacURL: { extends: .runtime_test }
-tests.package.test_lua_gd.TestLuaLuaGD: { extends: .runtime_test }
-tests.package.test_lua_gd.TestLuajitLuaGD: { extends: .runtime_test }
 tests.package.test_lua_http.TestLuaHttp: { extends: .runtime_test }
 tests.package.test_lua_http.TestLuajitHttp: { extends: .runtime_test }
-tests.package.test_lua_sdl2.TestLuaLuaSDL2: { extends: .runtime_test }
-tests.package.test_lua_sdl2.TestLuajitLuaSDL2: { extends: .runtime_test }
 tests.package.test_lua_utf8.TestLuaUtf8: { extends: .runtime_test }
 tests.package.test_lua_utf8.TestLuajitUtf8: { extends: .runtime_test }
 tests.package.test_luaexpat.TestLuaLuaExpat: { extends: .runtime_test }
@@ -401,16 +380,10 @@ tests.package.test_luafilesystem.TestLuaLuaFileSystem: { extends: .runtime_test
 tests.package.test_luafilesystem.TestLuajitLuaFileSystem: { extends: .runtime_test }
 tests.package.test_luaossl.TestLuaLuaossl: { extends: .runtime_test }
 tests.package.test_luaossl.TestLuajitLuaossl: { extends: .runtime_test }
-tests.package.test_luaposix.TestLuaLuaPosix: { extends: .runtime_test }
-tests.package.test_luaposix.TestLuajitLuaPosix: { extends: .runtime_test }
 tests.package.test_luasec.TestLuaLuaSec: { extends: .runtime_test }
 tests.package.test_luasec.TestLuajitLuaSec: { extends: .runtime_test }
 tests.package.test_luasocket.TestLuaLuaSocket: { extends: .runtime_test }
 tests.package.test_luasocket.TestLuajitLuaSocket: { extends: .runtime_test }
-tests.package.test_luasyslog.TestLuaLuasyslog: { extends: .runtime_test }
-tests.package.test_luasyslog.TestLuajitLuasyslog: { extends: .runtime_test }
-tests.package.test_luvi.TestLuvi: { extends: .runtime_test }
-tests.package.test_lzlib.TestLuaLzlib: { extends: .runtime_test }
 tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test }
 tests.package.test_perl.TestPerl: { extends: .runtime_test }
 tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test }
@@ -474,8 +447,6 @@ tests.package.test_rings.TestLuajitRings: { extends: .runtime_test }
 tests.package.test_rust.TestRust: { extends: .runtime_test }
 tests.package.test_rust.TestRustBin: { extends: .runtime_test }
 tests.package.test_syslog_ng.TestSyslogNg: { extends: .runtime_test }
-tests.package.test_tmux.TestTmux: { extends: .runtime_test }
-tests.package.test_turbolua.TestLuajitTurbolua: { extends: .runtime_test }
 tests.toolchain.test_external.TestExternalToolchainBuildrootMusl: { extends: .runtime_test }
 tests.toolchain.test_external.TestExternalToolchainBuildrootuClibc: { extends: .runtime_test }
 tests.toolchain.test_external.TestExternalToolchainCCache: { extends: .runtime_test }
@@ -484,4 +455,3 @@ tests.toolchain.test_external.TestExternalToolchainLinaroArm: { extends: .runtim
 tests.toolchain.test_external.TestExternalToolchainSourceryArmv4: { extends: .runtime_test }
 tests.toolchain.test_external.TestExternalToolchainSourceryArmv5: { extends: .runtime_test }
 tests.toolchain.test_external.TestExternalToolchainSourceryArmv7: { extends: .runtime_test }
-tests.utils.test_check_package.TestCheckPackage: { extends: .runtime_test }
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -4,7 +4,7 @@
 # It needs to be regenerated every time a defconfig is added, using
 # "make .gitlab-ci.yml".

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

 .check_base:
    except:
--- a/689
+++ b/689
@@ -1,519 +1,3 @@
-2019.11.3, released April 10th, 2020
-
-	Important / security related fixes.
-
-	core: Fix compatibility with make 4.3+. Also fixup /lib
-	references in libtool .la files, similar to how it is done for
-	/usr/*.
-
-	toolchain: Fix kernel headers validation check for external
-	toolchains.
-
-	fs/initramfs: fix show-info so it also shows the usual
-	rootfs-related variables.
-
-	Updated/fixed packages: barebox-aux, bluez5_utils, busybox,
-	civetweb, cog, collectd, ffmpeg, gcc, gnutls, gssdp, gvfs, haproxy,
-	hiredis, hostapd, kmscube, libical, libopenssl, libsndfile,
-	linux-tools, llvm, monit, ntp, php, pure-ftpd, radvd, redis,
-	samba4, screen, sysdig, syslinux, syslog-ng, tor, uacme,
-	util-linux, vala, vlc, wpa_supplicant, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12746: "sysdig" package description points to http://sysdig.org, ..
-
-2019.11.2, released March 16th, 2020
-
-	Important / security related fixes.
-
-	Core: Ensure package-file-lists data is correct after
-	incremental builds as well.
-
-	Fix a race condition related to creating the output/staging
-	symlink on systems with coreutils < 8.27.
-
-	Toolchain: ARC tools bumped to arc-2019.09.
-
-	Br2-external: Fix patch handling when external linux-extension
-	packages are used. Fix compatibility with make 4.3+
-
-	Util-linux: Ensure that hwclock is built without GPLv3
-	code. Notice that builds with hwclock has contained
-	GPLv3-licensed code since util-linux 2.30 (Buildroot 2017.08+)
-
-	Updated/fixed packages: armadillo, at, bcm2835, binutils,
-	blktrace, bluez-alsa, bootstrap, brltty, busybox, cairo,
-	clamav, cog, cups, czmq, dnsmasq, docker-containerd, dovecot,
-	dovecot-pigeonhole, e2fsprogs, elf2flt, eudev, exim, exiv2,
-	fbgrab, gettext-tiny, glibc, go, grep, gst1-validate, guile,
-	imagemagick, jhead, jpeg-turbo, kvm-unit-tests, lapack,
-	libarchive, libcgroup, libdrm, libevent, libexif, libftdi1,
-	libgdiplus, libjpeg, libsigrok, libsndfile, libssh2,
-	libsvgtiny, libvncserver, libvorbis, libxml2, libxslt, linknx,
-	lxc, lz4, mariadb, mbedtls, meson, mongoose, mosquitto, musl,
-	ncurses, nodejs, ntfs-3g, ogre, opencv3, openjdk, openjpeg,
-	openrc, openswan, openvmtools, optee-test, patch, php, piglet,
-	postgresql, pppd, proftpd, pure-ftpd, python-django,
-	python-pyqt5, python-setuptools-scm-git-archive, python3,
-	qemu, qt5base, qt5tools, qt5virtualkeyboard, qt5webengine,
-	qwt, rdesktop, ruby, runc, samba4, shellinabox,
-	skeleton-init-openrc, smartmontools, spdlog, sqlcipher, squid,
-	suricata, swig, swupdate, sysklogd, taglib, thrift,
-	ti-cgt-pru, uclibc, util-linux, vorbis-tools, webkitgtk,
-	wireshark, wpebackend-fdo, wpewebkit, xen,
-	xserver_xorg-server, zeromq, zsh, zziplib
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11996: opencv3 SIGILL on Cortex-A5 with VFPv4-D16
-	#12331: meson issue
-	#12456: qtvirtualkeyboard: No such file or directory
-	#12461: libglib2 build files with deep directory structure
-	#12481: minicom fails when output directory path contains "m4"
-	#12606: fbgrab location has changed
-
-2019.11.1, released January 12th, 2020
-
-	Important / security related fixes.
-
-	Infrastructure: kconfig: Fix reconfigure logic, python: Ensure
-	correct compiler and linker flags are used for compiled code
-
-	utils/scanpypi: Remind users to update DEVELOPERS
-
-	Defconfigs: imx6-sabresd: Fix the Qt5 display names,
-	imx8: Drop extra copy of U-Boot DTB
-
-	Updated/fixed packages: acsccid, bitcoin, boost, busybox,
-	cc-tool, cmocka, cpio, cups, dante, dialog, dillo, docker-cli,
-	docker-containerd, docker-engine, easy-rsa, ebtables,
-	ecryptfs-utils, efl, ffmpeg, gdb, git, glibc, gnupg2, go,
-	gpsd, grpc, gst1-plugins-bad, iputils, jasper,
-	kf5-kcoreaddons, leveldb, libarchive, libfribi, libgit2,
-	libkrb5, libp11, librsvg, libssh, libtomcrypt, libuio, libv4l,
-	lirc-tools, log4cplus, lrzip, lvm2, mali-t76x,
-	matchbox-desktop, mender-grubenv, mmc-utils, mosquitto,
-	nodejs, ntp, openipmi, opencv3, openpowerlink, openrc, pango,
-	perl-sys-cpu, pimd, postgresql, pulseaudio, python-brotli,
-	python-coherence, python-crc16, python-django, python-dpkt,
-	python-gobject, python-pyasn-modules, python-pypcap,
-	python-pyqt5, python-subprocess32, python3, qpdf,
-	qt-webkit-kiosk, qt5virtualkeyboard, qt5webengine, quota,
-	rabbitmq-c, rauc, rpcbind, rtl8821au, runc, rygel, samba4,
-	sdl2, setserial, snort, spidev_test,
-	sunxi-mali-mainline-driver, syslog-ng, sysrepo, tcllib, tftpd,
-	usbmount, w_scan, wavpack, wsapi, wsapi-fcgi, wsapi-xavante,
-	x265, xserver_xorg-server, ytree, zip
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12121: PyQt5.QtSerialPort and other modules not being built
-	#12286: Can't import gobject in python 3.8
-
-2019.11, released December 1st, 2019
-
-	Various fixes.
-
-	Infrastructure: Make HOST_<pkg>_DL_OPTS inherit from
-	<pkg>_DL_OPTS by default, just like it is done for a number of
-	other package variables.
-
-	Add <pkg>_KEEP_PY_FILES to exclude specific python .py files
-	from the removal done by BR2_PACKAGE_PYTHON{,3}_PYC_ONLY for
-	the (rare) case where the .py files are needed at runtime
-	rather than .pyc.
-
-	Updated/fixed packages: am33x-cm3, bind, collectd, go, gob2,
-	gst1-plugins-bad, haproxy, jasper, jpeg-turbo, libdrm,
-	libftdi, libftdi1, libnss, libselinux, libstrophe, lzma,
-	minicom, network-manager, nodejs, oniguruma, opencv3,
-	openvmtools, perl-gdgraph, perl-gdtextutil, prosody,
-	python-cchardet, systemd, tiff, wolfssl,
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11416: check-uniq-files staging issue
-	#12146: Oprofile runtime issue
-	#12166: Compiling nodejs for SAMA5D3 always crash with illegal inst..
-	#12171: Python-opencv needs config.py and config-3.7.py to run..
-	#12196: duma package
-	#12211: host-nodejs 10.15.3 package fail to build
-	#12316: tzdata fails to install with empty "default local time"
-	#12326: network-manager build fails with missing glib error
-	#12366: Gstreamer1 gst1-plugins-bad do not compile with RPI-Userland
-
-2019.11-rc3, released November 24th, 2019
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: asterisk, clamav, domoticz, faifa,
-	gerbera, kmod, kvm-unit-tests, libupnp18, linux-serial-test,
-	lsof, ltp-testsuite, lxc, mesa3d, mesa3d-headers, perl, php,
-	postgresql, qemu, rauc, redis, rpcbind, spice, spice-protocol,
-	systemd, tftpd, waylandpp, webkitgtk, zip
-
-2019.11-rc2, released November 16th, 2019
-
-	Fixes all over the tree.
-
-	Toolchain: ARC tools bumped to arc-2019.09-rc1, ensure
-	external toolchain kernel headers version check correctly stop
-	the build on mismatch
-
-	Meson: Fix generation of global cross-compilation.conf
-
-	Download: Also use the package download method for extra
-	downloads from the same site, so it does not get confused by
-	URLs containing '+'
-
-	Defconfigs: Fix boot issue for beaglebone
-
-	Updated/fixed packages: bird, chrony, connman, dhcp, domoticz,
-	dropwatch, dtc, elf2flt, gettext-tiny, glog, intel-microcode,
-	ipsec-tools, jailhouse, kodi, libfribi, libmbim, libressl,
-	libsigrokdecode, libsvgtiny, linux-serial-test, ltp-testsuite,
-	lvm2, lxc, mariadb, mesa3d, minizip, ndisc6, neardal, ninja,
-	ofono, openvmtools, oracle-mysql, qt5wayland, safeclib, socat,
-	sudo, systemd, wpewebkit, xserver_xorg-server
-
-2019.11-rc1, released November 5th, 2019
-
-	Fixes all over the tree and new features.
-
-	Dependencies: Gcc/g++ 4.8 or newer is now required on the
-	build host.
-	Ensure host has JSON::PP perl module installed if
-	webkitgtk/wpewebkit packages are enabled as it is needed
-	during their build process.
-
-	Toolchain: Add support for the D programming language (GCC
-	9.x, Glibc).
-	GCC 9.x updated to 9.2.0, Glibc updated to 2.30, Musl updated
-	to 1.1.24, uClibc-ng updated to 1.0.32, ARC toolchain updated
-	to arc-2019.09-eng002.
-	Musl: Add a patch to add support for
-	sched_{get,set}scheduler() and sched_{get,set}param() for
-	compatibility.
-	Generate check-headers program under BUILD_DIR rather than
-	/tmp to fix issues with distributions mounting /tmp noexec.
-	Also copy libssp.so for external toolchains if SSP
-	to handle toolchains providing SSP support in libssp rather
-	than in the C library
-
-	New defconfigs: Beaglebone AI, FriendlyARM Nanopi NEO Plus2,
-	Libre Computer "La Frite", QEMU Armv7-A with trustzone/OP-TEE,
-	STM32MP157 Discovery Kit
-
-	Arch: RISC-V: Default to a sensible floating point ABI based
-	on the selected ISA extensions rather than always defaulting
-	to ILP32/64
-
-	Graph-size: Package sizes are now shown in human readable form
-	(Kib/Mib/Gib) rather than always in Kib. Binary (KB/MB/GB)
-	format can be selected using the --binary option. The cut-off
-	limit for classifying packages as "other" is now configurable
-	using the --size-limit option.
-
-	Br2-external: Linux kernel extensions can now also be provided
-	in an external tree by adding packages under
-	linux/linux-ext-*.mk. See the manual for details.
-
-	Fakeroot now works correctly under Microsoft Windows 10
-	Services for Linux, which does not provide SYSV IPC support
-
-	The check-uniq-files logic which would complain if multiple
-	packages would touch the same files has been removed as it
-	causes issues in certain situations (when packages are
-	rebuilt) and the issue is no longer considered a problem for
-	toplevel parallel builds as those will use a per-package
-	staging/target directory.
-	With this removed, Python is no longer required for a basic
-	build (only for optional scripts).
-
-	support/scripts/genimage.sh will no longer make a copy of
-	TARGET_DIR, speeding up post-build/image scripts.
-
-	The runtime test logic now uses Python 3.x.
-
-	A 'v' prefix has been dropped from the <pkg>_SOURCE variable
-	for a number of packages to match the version numbers used by
-	https://release-monitoring.org
-
-	New packages: caps, collectl, dav1d, fstrcmp, ima-evm-utils,
-	jitterentropy-library, kodi-vfs-rar, kodi-vfs-sftp, libavl,
-	libhttpserver, libmspack, libnetconf2, libolm, libyang,
-	linux-serial-test, lrzip, mdevd, minimodem, musl-fts, netifrc,
-	ogre, openlayers, python-aioredis, python-asgiref,
-	python-backports-functools-lru-cache, python-bluezero,
-	python-brotli, python-channels, python-channels-redis,
-	python-colorlog, python-daphne, python-django-enumfields,
-	python-jaraco-functools, python-kiwisolver, python-msgfy,
-	python-rpi-ws281x, python-setuptools-scm-git-archive,
-	python-simplelogging, python-soupsieve, python-sqliteschema,
-	python-sqlparse, python-tqdm, python-webencodings, qt5webview,
-	restclient-cpp, ripgrep, snmpclitools, sunwait, sysrepo,
-	uacme, utf8proc, uvw, ytree
-
-	Removed packages: alljoyn, alljoyn-base, alljoyn-tcl-base,
-	devmem2, eventlog, kodi-audiodecoder-opus,
-	kodi-screensaver-planestate, kodi-visualisation-waveforhue,
-	python-pysnmp-apps, riscv-pk, ustr
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#9881:  systemd-resolved not setting resolv.conf link
-	#10171: devmem2 w (word) is 8 bytes in x86 64 systems
-	#10586: musl gcc has ifunc enabled when musl doesn't support it
-	#10806: Allow nfs-utils to use ipv6
-	#11366: [2018.08] SysV IPC not available for fakeroot on WSL
-	#11411: check-uniq-files target issue
-	#11766: Console (getty) issues with systemd
-	#11781: mariadb build error
-	#12031: Build of cups-filters fails while linking, apparently due..
-	#12116: console prompt does not appear after login
-	#12141: eudev package is missing "render" and "kvm" groups
-	#12181: dropbear: norootlogin (-w) no longer works when PAM is enabled
-	#12186: Raspberry Pi Zero-W build fails on newer kernel versions
-	#12191: cmake BUILDDIR
-	#12241: Permission denied while running "make"
-	#12261: sudo versions prior to 1.8.28 are affected.
-	#12276: make clean/distclean does not remove BR2_DL_DIR and BR2_HOST_DIR
-	#12281: Custom configuration fails to build (based on raspberrypi3_..
-
-2019.08.2, released November 9th, 2019
-
-	Important / security related fixes.
-
-	Toolchain: Also copy libssp.so for external toolchains if SSP
-	to handle toolchains providing SSP support in libssp rather
-	than in the C library
-
-	Download: Also use the package download method for extra
-	downloads from the same site, so it does not get confused by
-	URLs containing '+'
-
-	Fakeroot now works correctly under Microsoft Windows 10
-	Services for Linux, which does not provide SYSV IPC support
-
-	utils/test-pkg: ensure to exit with an error upon failure
-
-	Updated/fixed packages: asterisk, azmq, binutils,
-	cups-filters, domoticz, dtc, duma, elf2flt, eudev, exfat,
-	exfat-utils, fakeroot, fdk-aac, file, freerdp, gcc, gd,
-	ghostscript, go, gpsd, grpc, gst1-plugins-base, gvfs, icu,
-	intel-microcode, kvm-unit-tests, libfribidi, libnspr, libnss,
-	libopenssl, libpcap, libpciaccess, librsvg, libseccomp,
-	libsigrok, libtorrent, libunwind, libva, linux-tools,
-	lua-sdl2, lxc, minizip, mjpegtools, mongoose, mono, nbd,
-	nfs-utils, php, piglit, python, python-autobahn,
-	python-pysnmp-apps, python-tornado, python3, qemu, qt5base,
-	ruby, safeclib, samba4, sdl_mixer, sox, sudo, suricata,
-	systemd, tcpdump, unscd, util-linux, vdr-plugin-vnsiserver,
-	vtun, wireshark, xvisor, yaffs2utils
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11366: [2018.08] SysV IPC not available for fakeroot on WSL
-	#12261: sudo versions prior to 1.8.28 are affected
-
-2019.08.1, released October 3rd, 2019
-
-	Important / security related fixes.
-
-	Defconfigs: AArch64-efi: Fix grub configuration, Beaglebone:
-	Use default console settings
-
-	Dependencies: Ensure host has JSON::PP perl module installed
-	if webkitgtk/wpewebkit packages are enabled as it is needed
-	during their build process.
-
-	Toolchain: Generate check-headers program under BUILD_DIR
-	rather than /tmp to fix issues with distributions mounting
-	/tmp noexec.
-
-	Updated/fixed packages: asterisk, augeas, axel, bind, bwm-ng,
-	cups, cups-filters, docker-cli, docker-engine, docker-proxy,
-	e2fsprogs, eudev, exim, expat, gcc, go, haveged, ifplugd, joe,
-	kf5-extra-cmake-modules, kf5-modemmanager-qt,
-	kf5-networkmanager-qt, libcamera, libcurl, libgcrypt,
-	libglib2, libgpg-error, libnspr, libnss, libopenssl,
-	logrotate, luksmeta, mariadb, mbedtls, mongodb, mosquitto,
-	ncurses, nfs-utils, nghttp2, nodejs, openvmtools, php,
-	protobuf, putty, qemu, samba4, snort, swupdate,
-	systemd-bootchart, thttpd, uclibc, unzip, util-linux,
-	wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10806: Allow nfs-utils to use ipv6
-	#11781: mariadb build error
-	#12031: Build of cups-filters fails while linking, apparently due..
-	#12141: eudev package is missing "render" and "kvm" groups
-	#12241: Permission denied while running "make"
-
-2019.08, released September 1st, 2019
-
-	Various fixes.
-
-	Defconfigs: Removed nanopc t4, nanopi m4 and neo4, pine64
-	rockpro64 and raxda rock pi4 as they rely on a ARM32 toolchain
-	on the build host to build ATF. These defconfigs will be added
-	back once a package providing such toolchain is
-	available. Also dropped ts4800 defconfig as it does not build
-	with GCC >= 8.x.
-
-	Updated/fixed packages: libxcb, php, python-numpy, webkitgtk,
-	wpewebkit, xfont_font-util
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12156:	buildroot-2019.08-rc3 does not build for Pi Zero W
-
-2019.08-rc3, released August 28th, 2019
-
-	Fixes all over the tree.
-
-	Updated/fixed packages: clamav, dovecot, dovecot-pigeonhole,
-	gcc, intel-microcode, libmicrohttpd, libmodplug, mpg123,
-	nginx, openldap, python, qemu, samba4, squid, strace, vlc
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11686: fbdev_drv.so: undefined symbol: shadowUpdatePackedWeak,..
-
-2019.08-rc2, released August 20th, 2019
-
-	Fixes all over the tree.
-
-	Compile fixes for a number of defconfigs.
-
-	Updated/fixed packages: apache, autofs, batctl, batman-adv,
-	bind, collectd, cwiid, dahdi-linux, dahdi-tools, daq,
-	dehydrated, dhcp, dtc, efl, enlightenment, evtest, giflib,
-	gnutls, go, gst-plugins-bad, gst-plugins-base,
-	gst1-plugins-bad, gst1-plugins-base, gst1-rtsp-server, gtkmm3,
-	gupnp, harfbuzz, imagemagick, lftp, libbsd, libcpprestsdk,
-	libdnet, libfm, libgit2, libgtk2, libgtk3, libpri, librsvg,
-	libss7, libssh2, libwpe, lua-cqueues, metacity, micropython,
-	mpd, mpg123, musl, mpv, openblas, openbox, opencv, pango,
-	pcmanfm, piglit, pigpio, pinentry, postgresql, qemu, qt5base,
-	qt5enginio, qt5multimedia, qt5serialbus, quagga, quazip,
-	rrdtool, rygel, samba4, stellarium, tcpreplay, ti-gfx, vte,
-	wampcc, wilink-bt-firmware, wireless-regdb, wpebackend-fdo,
-	xscreensaver
-
-	Removed packages: libamcodec, odroid-mali, odroid-scripts
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#9481:  NetworkManager/Ping unable to resolve domains
-	#10566: php.mk is missing option --with-pgsql
-	#10861: Package batman_adv Makefile is missing include header direct..
-	#11641: linux kernel .config timestamp always out of date fixed with..
-	#11671: russian locale ru_RU:145: LC_TIME: syntax error
-	#11701: recuuring of usr and in bin shortcuts are created
-	#11741: pigpio does not build host-pigpio
-	#11876: automount using host mount/umount
-	#11881: Build breaks with lftp package enabled and libexpat1-dev inst..
-	#11921: dahdi fails to build
-	#11936: libcpprestsdk should install to staging
-	#11946: wilink-bt-firmware: moved from github to http://git.ti.com/ti-bt
-	#11961: libpri build failure
-	#12086: dhcp shared libraries not installed to target
-	#12096: tcpreplay: build fails if libdumbnet-dev is installed in the..
-	#12106: daq: build fails if libdumbnet-dev is installed in the host
-	#12126: vc4 has neon as hard dependency
-
-2019.08-rc1, released August 9th, 2019
-
-	Fixes all over the tree and new features.
-
-	toolchain: ARC toolchain updated to 2019.03 (binutils 2.32.51
-	/ GCC 8.3.1 / glibc 2.29), ARM AAarch64/ARM toolchains updated
-	to 2019.03. Add GCC 9.1.0, remove GCC 4.9 and 6.5, add GDB
-	8.3, remove GDB 7.12 and 8.0.1, default to GDB 8.2, GCC
-	8.3.0. Musl updated to 1.1.23, bringing support for RISC-V 64.
-
-	Architectures: Internal toolchain support for C-SKY, support
-	for ARC HS48 v3.1 and HS38 with Quad MAC & FPU, support for
-	ARM A76,  A76/A55 big.LITTLE, emag, neoverse-N1, phecda and
-	tsv110.
-
-	Filesystems: Pass extra pax options to tar for binary
-	reproducibility. Build host-cpio for the --reproducible option
-	support when BR2_REPRODUCIBLE is enabled. Genimage updated to
-	version 11, bringing GPT support.
-
-	Br2-external: Add support for injecting additional options to
-	the list of preconfigured external toolchains and libjpeg and
-	openssl providers using files under provides/. See the manual
-	for details.
-
-	Ensure custom <pkg>_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS are
-	passed before the standard exclusions so they are not ignored
-	by rsync when using override-srcdir.
-
-	Gnuconfig updated to 2019-05-28, adding C-SKY support.
-
-	test-pkg: Correct long option handling and clean output dir
-	after a successful build to save disk space.
-
-	support/testing: Emulate a machine with 256MB RAM to fix
-	issues with certain tests running out of memory, use
-	virtio-rng to provide needed entrophy.
-
-	pkg-stats: support outputting in JSON format with --json for
-	easier post processing. The classic HTML output is still
-	available with --html. Parallelize access to
-	release-monitoring.org to speed up runtime.
-
-	Drop non-conventional version prefix/suffix/separators for
-	packages for better compatibility with release-monitoring.org
-
-	Packages:
-	Init systems: Add basic openrc support and
-	<pkg>_INSTALL_INIT_OPENRC variable in the infrastructure to
-	install openrc service scripts if enabled.
-
-	busybox: Build each applet as a separate binary when SELinux
-	is enabled for more finegrained policy control. Use daemon
-	mode for mdev rather than legacy hotplug.
-
-	linux: Workaround -Werror related build failure on powerpc,
-	by forcing CONFIG_PPC_DISABLE_WERROR on.
-
-	Defconfigs: QEMU: use 'rootwait' kernel option to ensure root
-	partition is available before mounting.
-
-	New defconfigs: HiFive Unleashed, I.MX8MM EVK and Pico, Nanopi
-	m4 and neo4, Nanopc t4, Olimex A33 olinuxino, Pine64
-	Rockpro64, PowerPC mac99, QEMU C-SKY 610/807/810/860 virt,
-	Raspberry Pi 4, Raxda rock pi4, Solidrun Clearfog GT-8K
-
-	Removed defconfigs: Odroid C2
-
-	New packages: bitcoin, c-capnproto, fatcat, ifmetric, jack1,
-	jailhouse, libubootenv, luasyslog, mender-grubenv,
-	murata-cyw-fw, openrc, piglit, python-colorama, python-cycler,
-	python-hiredis, python-ifaddr, python-inflection,
-	python-iptables, python-matplotlib, python-periphery,
-	python-pycairo, python-redis, python-termcolor,
-	python-tinyrpc, python-txdbus, skeleton-init-openrc, spdlog,
-	sshguard, stellarium, zziplib
-
-	Removed packages: xapp_mkfontdir
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11096: Upgrade from glibc 2.26 to 2.27 broke some locales...
-	#11271: utils/check-package fails with exception depending on..
-	#11991: [numpy] segfault when compiling for RPi3 64bits
-	#12016: Grub fails to boot bzImage after upgrade to 2019.05
-	#12046: Can’t login as root user after upgrading to buildroot..
-	#12051: package/dhcp installs libtool wrapper scripts on tar...
-	#12076: Patchelf can link against an incompatible libc++ ver...
-
 2019.05.3, Released October 3rd, 2019

 	Important / security related fixes.
@@ -729,179 +213,6 @@
 	#11761: Building custom kernel 5.1-rc3 or later breaks on objtool
 	#11816: Only selected coreutils binaries are installed

-2019.02.7, Released November 10th, 2019
-
-	Important / security related fixes.
-
-	support/testing: use a kernel with HW_RANDOM_VIRTIO to work
-	around issues with lack of entrophy
-
-	Toolchain: Also copy libssp.so for external toolchains if SSP
-	is enabled to handle toolchains providing SSP support in
-	libssp rather than in the C library
-
-	Download: Also use the package download method for extra
-	downloads from the same site, so it does not get confused by
-	URLs containing '+'
-
-	Fakeroot now works correctly under Microsoft Windows 10
-	Services for Linux, which does not provide SYSV IPC support
-
-	utils/test-pkg: ensure to exit with an error upon failure
-
-	Updated/fixed packages: asterisk, azmq, cups-filters,
-	domoticz, duma, elf2flt, eudev, exfat, exfat-utils, fakeroot,
-	file, freerdp, gd, ghostscript, go, gvfs, intel-microcode,
-	kvm-unit-tests, libarchive, libnspr, libnss, libopenssl,
-	libpcap, libpciaccess, librsvg, libseccomp, libsigrok,
-	libtorrent, libunwind, linux-tools, lua-sdl2, lxc, minizip,
-	mjpegtools, mongoose, php, python, python-pysnmp-apps,
-	python3, qemu, qt5base, ruby, safeclib, samba4, sdl_mixer,
-	sox, sudo, systemd, tcpdump, unscd, util-lkinux, vtun, xvisor,
-	yaffs2utils
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11366: [2018.08] SysV IPC not available for fakeroot on WSL
-	#12261: sudo versions prior to 1.8.28 are affected
-
-2019.02.6, Released October 3rd, 2019
-
-	Important / security related fixes.
-
-	Defconfigs: AArch64-efi: Fix grub configuration, Beaglebone:
-	Use default console settings
-
-	Dependencies: Ensure host has JSON::PP perl module installed
-	if webkitgtk/wpewebkit packages are enabled as it is needed
-	during their build process.
-
-	Toolchain: Generate check-headers program under BUILD_DIR
-	rather than /tmp to fix issues with distributions mounting
-	/tmp noexec.
-
-	Updated/fixed packages: asterisk, augeas, bind, bwm-ng, cups,
-	cups-filters, docker-cli, docker-engine, docker-proxy,
-	dropbear, e2fsprogs, eudev, exim, expat, gcc, go, ifplugd,
-	haveged, iptables, joe, kf5-extra-cmake-modules,
-	kf5-modemmanager-qt, kf5-networkmanager-qt, libcurl,
-	libgcrypt, libgpg-error, libnftl, libnspr, libnss, libopenssl,
-	luksmeta, mariadb, mbedtls, mongodb, mosquitto, ncurses,
-	nfs-utils, nghttp2, nodejs, openvmtools, php, protobuf, putty,
-	qemu, qt5base, samba4, swupdate, systemd-bootchart, thttpd,
-	uclibc, unzip, util-linux, wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#10806: Allow nfs-utils to use ipv6
-	#11781: mariadb build error
-	#12031: Build of cups-filters fails while linking, apparently due..
-	#12141: eudev package is missing "render" and "kvm" groups
-	#12181: dropbear: norootlogin (-w) no longer works when PAM is enabled
-	#12241: Permission denied while running "make"
-
-2019.02.5, Released September 2nd, 2019
-
-	Important / security related fixes.
-
-	Filesystems: Pass extra pax options to tar for binary
-	reproducibility.
-
-	Updated/fixed packages: apache, arm-trusted-firmware,
-	asterisk, atk, autofs, batctl, batman-adv, berkeleydb, brotli,
-	busybox, bzip2, clamav, cloop, cmake, collectd, connman-gtk,
-	cryptopp, dahdi-linux, dahdi-tools, daq, dehydrated, dovecot,
-	dovecot-pigeonhole,, elfutils, evtest, exim, expect, giflib,
-	git, glib-networking, glibc, gnupg2, gnutls, go,
-	gst1-rtsp-server, gtkperf, gupnp-tools, gvfs, imagemagick,
-	imx-uuc, intel-microcode, json-glib, lftp, libbsd, libcurl,
-	libgit2, libgtk3, libmodplug, libnss, libpri, libshout,
-	libss7, libssh2, libvips, libxcb, linux-headers, mdadm,
-	mesa3d, metacity, mpg123, mosquitto, musl, nginx, openblas,
-	opencv3, openldap, openvmtools, pcmanfm, php, pigpio,
-	postgresql, prboom, proftpd, proj, python, python-django,
-	python-idna, python-numpy, python-urllib3, python3, qemu, qt5,
-	qt5base, qt5enginio, quagga, rygel, squid, subversion,
-	tcpreplay, unzip, vlc, vte, webkitgtk, weston, wireless-regdb,
-	xen, xfont_font-util, xlib_libICE, xlib_libXfont,
-	xlib_libXfont2, yad, zeromq
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11741: pigpio does not build host-pigpio
-	#11876: automount using host mount/umount
-	#11881: Build breaks with lftp package enabled and libexpat1-dev inst..
-	#11921: dahdi fails to build
-	#11961: libpri build failure
-	#12096: tcpreplay: build fails if libdumbnet-dev is installed in the..
-	#12106: daq: build fails if libdumbnet-dev is installed in the host
-	#12126: vc4 has neon as hard dependency
-
-2019.02.4, Released July 10th, 2019
-
-	Important / security related fixes.
-
-	arch: x86: Fix typo breaking 'core-avx2' variant, add Westmere
-	variant.
-
-	linux: Workaround -Werror related build failure on powerpc,
-	by forcing CONFIG_PPC_DISABLE_WERROR on.
-
-	support/testing: Emulate a machine with 256MB RAM to fix
-	issues with certain tests running out of memory.
-
-	test-pkg: Correct long option handling and clean output dir
-	after a successful build to save disk space.
-
-	Ensure custom <pkg>_OVERRIDE_SRCDIR_RSYNC_EXCLUSIONS are
-	passed before the standard exclusions so they are not ignored
-	by rsync when using override-srcdir.
-
-	Defconfigs: QEMU: use 'rootwait' kernel option to ensure root
-	partition is available before mounting.
-
-	Updated/fixed packages: barebox, bzip2, davfs2, dbus, dialog,
-	docker-cli, docker-engine, expat, faad2, ffmpeg, freeswitch,
-	gerbera, haveged, irssi, libcdadio, libgit2, libglib2,
-	libsecret, libvncserver, lmbench, logrotate, mariadb, meson,
-	mongoose, monit, mpd, openblas, php, postgresql, psplash,
-	python, python-django, python3, qt5base, samba4, taglib,
-	tvheadend, vlc, webkitgtk, xserver_xorg-server, znc
-
-2019.02.3, Released June 7th, 2019
-
-	Important / security related fixes.
-
-	Infra: pkg-config: Use a dedicated timestamp file rather than
-	.config as that gets touched by linux-4.19+, causing repeated
-	builds.
-
-	check-bin-arch: Also ignore /usr/lib/grub to support merged
-	/usr setups, similar to how /lib/grub is ignored.
-
-	gnuconfig/config.sub: Add C-SKY architecture support.
-
-	Updated/fixed packages: assimp, atftp, atop, botan, busybox,
-	ca-certificates, chocolate-doom, cjson, coreutils, cracklib,
-	ddrescue, dhcp, docker-cli, docker-containerd, docker-engine,
-	dosfstools, dovecot, dovecot-pigeonhole, dropbear, exim,
-	ffmpeg, flare-engine, gcc, gdb, gerbera, glibmm, go, gpsd,
-	gst-ffmpeg, gst1-plugins-bad, gst1-plugins-base, imagemagick,
-	intel-microcode, jasper, kf5-kcoreaddons, kismet, libcurl,
-	libglib2, libnss, libopenssl, libsigrok, libssh2, libupnp18,
-	linuxptp, luajit, lynx, matchbox-panel, mender,
-	netcat-openbsd, netsurf, nfs-utils, opus, orc, owfs,
-	pcsc-lite, php, popt, postgresql, python, python-cython,
-	python-django, python-ply, qt5enginio, rpm, runc, samba4,
-	sqlite, subversion, supertux, systemd, tslib, uclibc,
-	v4l2loopback, webkitgtk, woff2
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11816: Only selected coreutils binaries are installed
-	#11841: grub-efi.cfg not used when building EFI disk image
-	#11911: systemd v240 memory leak in systemd-journald
-
 2019.02.2, Released April 29th, 2019

 	Important / security related fixes.
--- a/Config.in
+++ b/Config.in
@@ -14,21 +14,38 @@ config BR2_HOSTARCH
 	string
 	option env="HOSTARCH"

-config BR2_BASE_DIR
+config BR2_BUILD_DIR
 	string
-	option env="BASE_DIR"
-
-# br2-external paths definitions
-source "$BR2_BASE_DIR/.br2-external.in.paths"
+	option env="BUILD_DIR"

 # Hidden config symbols for packages to check system gcc version
 config BR2_HOST_GCC_VERSION
 	string
 	option env="HOST_GCC_VERSION"

+config BR2_HOST_GCC_AT_LEAST_4_5
+	bool
+	default y if BR2_HOST_GCC_VERSION = "4 5"
+
+config BR2_HOST_GCC_AT_LEAST_4_6
+	bool
+	default y if BR2_HOST_GCC_VERSION = "4 6"
+	select BR2_HOST_GCC_AT_LEAST_4_5
+
+config BR2_HOST_GCC_AT_LEAST_4_7
+	bool
+	default y if BR2_HOST_GCC_VERSION = "4 7"
+	select BR2_HOST_GCC_AT_LEAST_4_6
+
+config BR2_HOST_GCC_AT_LEAST_4_8
+	bool
+	default y if BR2_HOST_GCC_VERSION = "4 8"
+	select BR2_HOST_GCC_AT_LEAST_4_7
+
 config BR2_HOST_GCC_AT_LEAST_4_9
 	bool
 	default y if BR2_HOST_GCC_VERSION = "4 9"
+	select BR2_HOST_GCC_AT_LEAST_4_8

 config BR2_HOST_GCC_AT_LEAST_5
 	bool
@@ -536,6 +553,7 @@ endchoice
 config BR2_GOOGLE_BREAKPAD_ENABLE
 	bool "Enable google-breakpad support"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -694,18 +712,6 @@ endmenu

 comment "Security Hardening Options"

-config BR2_PIC_PIE
-	bool "Build code with PIC/PIE"
-	depends on BR2_SHARED_LIBS
-	depends on BR2_TOOLCHAIN_SUPPORTS_PIE
-	help
-	  Generate Position-Independent Code (PIC) and link
-	  Position-Independent Executables (PIE).
-
-comment "PIC/PIE needs a toolchain w/ PIE"
-	depends on BR2_SHARED_LIBS
-	depends on !BR2_TOOLCHAIN_SUPPORTS_PIE
-
 choice
 	bool "Stack Smashing Protection"
 	default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy
@@ -740,14 +746,14 @@ config BR2_SSP_REGULAR

 config BR2_SSP_STRONG
 	bool "-fstack-protector-strong"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	help
 	  Like -fstack-protector but includes additional functions to be
 	  protected - those that have local array definitions, or have
 	  references to local frame addresses.

-	  -fstack-protector-strong officially appeared in gcc 4.9, but
-	  some vendors have backported -fstack-protector-strong to older
-	  versions of gcc.
+comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

 config BR2_SSP_ALL
 	bool "-fstack-protector-all"
@@ -788,16 +794,11 @@ config BR2_RELRO_PARTIAL

 config BR2_RELRO_FULL
 	bool "Full"
-	depends on BR2_TOOLCHAIN_SUPPORTS_PIE
-	select BR2_PIC_PIE
 	help
 	  This option includes the partial configuration, but also marks
 	  the GOT as read-only at the cost of initialization time during
 	  program loading, i.e every time an executable is started.

-comment "RELRO Full needs a toolchain w/ PIE"
-	depends on !BR2_TOOLCHAIN_SUPPORTS_PIE
-
 endchoice

 comment "RELocation Read Only (RELRO) needs shared libraries"
@@ -864,5 +865,4 @@ source "package/Config.in.host"

 source "Config.in.legacy"

-# br2-external menus definitions
-source "$BR2_BASE_DIR/.br2-external.in.menus"
+source "$BR2_BUILD_DIR/.br2-external.in"
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -144,241 +144,7 @@ endif

 ###############################################################################

-comment "Legacy options removed in 2019.11"
-
-config BR2_PACKAGE_OPENVMTOOLS_PROCPS
-	bool "openvmtools' procps support was removed"
-	select BR2_LEGACY
-	help
-	  Upstream stopped supporting this option a while ago.
-
-config BR2_PACKAGE_ALLJOYN
-	bool "alljoyn was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_PACKAGE_ALLJOYN_BASE
-	bool "alljoyn-base was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL
-	bool "alljoyn-base control panel was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION
-	bool "alljoyn-base notification was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING
-	bool "alljoyn-base onboarding was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_PACKAGE_ALLJOYN_TCL_BASE
-	bool "alljoyn-tcl-base was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_PACKAGE_ALLJOYN_TCL
-	bool "alljoyn-tcl was removed"
-	select BR2_LEGACY
-	help
-	  The alljoyn framework is dead
-
-config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS
-	string "toolchain-external extra libs option has been renamed"
-	help
-	  The option BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS has
-	  been renamed to BR2_TOOLCHAIN_EXTRA_LIBS.
-
-config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS_WRAP
-	bool
-	default y if BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS != ""
-	select BR2_LEGACY
-
-config BR2_PACKAGE_PYTHON_PYSNMP_APPS
-	bool "python-pysnmp-apps was removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SNMPCLITOOLS
-	help
-	  Following upstream changes, the python-pysnmp-apps package
-	  has been removed, and snmpclitools should be used as a
-	  replacement.
-
-config BR2_KERNEL_HEADERS_5_2
-	bool "kernel headers version 5.2.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.2.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_TARGET_RISCV_PK
-	bool "riscv-pk was removed"
-	select BR2_LEGACY
-	help
-	  The RISC-V Proxy Kernel (pk) and Berkley Boot Loader (BBL)
-	  have been replaced with OpenSBI.
-
-config BR2_PACKAGE_SQLITE_STAT3
-	bool "sqlite stat3 support was removed"
-	select BR2_LEGACY
-	help
-	  Upstream removed the support for stat3.
-
-config BR2_KERNEL_HEADERS_5_1
-	bool "kernel headers version 5.1.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.1.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_DEVMEM2
-	bool "devmem2 package was removed"
-	select BR2_LEGACY
-	help
-	  Use the the Busybox devmem utility, instead, which provides
-	  the same functionality.
-
-config BR2_PACKAGE_USTR
-	bool "ustr package removed"
-	select BR2_LEGACY
-	help
-	  The 'ustr' package was only used by SELinux libsemanage, but
-	  since SELinux 2.7, ustr is no longer used. Therefore, we
-	  removed this package from Buildroot.
-
-config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE
-	bool "kodi-screensaver-planestate package was removed"
-	select BR2_LEGACY
-	help
-	  This package is incompatible with Kodi 18.x.
-
-config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE
-	bool "kodi-visualisation-waveforhue package was removed"
-	select BR2_LEGACY
-	help
-	  This package is incompatible with Kodi 18.x.
-
-config BR2_PACKAGE_KODI_AUDIODECODER_OPUS
-	bool "kodi-audiodecoder-opus package was removed"
-	select BR2_LEGACY
-	help
-	  This package is incompatible with Kodi 18.x.
-
-config BR2_PACKAGE_MESA3D_OSMESA
-	bool "mesa OSMesa option renamed"
-	select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC if BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
-	select BR2_LEGACY
-	help
-	  The option was renamed in order to match the naming used
-	  by the meson buildsystem.
-
-config BR2_PACKAGE_HOSTAPD_DRIVER_RTW
-	bool "hostapd rtl871xdrv driver removed"
-	select BR2_LEGACY
-	help
-	  Since the update of hostapd to 2.9, the patch provided for
-	  the rtl871xdrv no longer works, although it
-	  applies. Moreover, AP support for Realtek chips is broken
-	  anyway in kernels > 4.9. Therefore, this option has been
-	  removed.
-
-config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW
-	bool "new dbus support option in wpa_supplicant was renamed"
-	select BR2_PACKAGE_WPA_SUPPLICANT_DBUS if BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_LEGACY
-	help
-	  The new dbus support option was renamed.
-
-config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD
-	bool "old dbus support in wpa_supplicant was removed"
-	select BR2_LEGACY
-	help
-	  The old dbus support was removed.
-
-comment "Legacy options removed in 2019.08"
-
-config BR2_TARGET_TS4800_MBRBOOT
-	bool "ts4800-mbrboot package was removed"
-	select BR2_LEGACY
-	help
-	  The defconfig for the TS4800 platform has been removed, so
-	  the ts4800-mbrboot package, containing the boot code for
-	  this specific platform has been removed as welL.
-
-config BR2_PACKAGE_LIBAMCODEC
-	bool "liamcodec package was removed"
-	select BR2_LEGACY
-	help
-	  Support for odroidc2 based systems was removed, making the
-	  libamcodec package useless.
-
-config BR2_PACKAGE_ODROID_SCRIPTS
-	bool "odroid-scripts package was removed"
-	select BR2_LEGACY
-	help
-	  Support for odroidc2 based systems was removed, making the
-	  odroid-scripts package useless.
-
-config BR2_PACKAGE_ODROID_MALI
-	bool "odroid-mali package was removed"
-	select BR2_LEGACY
-	help
-	  Support for odroidc2 based systems was removed, making the
-	  odroid-mali package useless.
-
-config BR2_PACKAGE_KODI_PLATFORM_AML
-	bool "Kodi AMLogic support was removed"
-	select BR2_LEGACY
-	help
-	  Support for AMLogic was removed due to the removal of the
-	  odroidc2 defconfig.
-
-config BR2_GCC_VERSION_6_X
-	bool "gcc 6.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 6.x has been removed. The current
-	  default version (8.x or later) has been selected instead.
-
-config BR2_GCC_VERSION_4_9_X
-	bool "gcc 4.9.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 4.9.x has been removed. The current
-	  default version (8.x or later) has been selected instead.
-
-config BR2_GDB_VERSION_7_12
-	bool "gdb 7.12.x has been removed"
-	select BR2_LEGACY
-	help
-	  The 7.12.x version of gdb has been removed. Use a newer
-	  version instead.
-
-config BR2_PACKAGE_XAPP_MKFONTDIR
-	bool "mkfontdir is now included in xapp_mkfontscale"
-	select BR2_PACKAGE_XAPP_MKFONTSCALE
-	select BR2_LEGACY
-	help
-	  xapp_mkfontscale now includes the mkfontdir script previously
-	  distributed separately for compatibility with older X11
-	  versions.
-
-config BR2_GDB_VERSION_8_0
-	bool "gdb 8.0.x has been removed"
-	select BR2_LEGACY
-	help
-	  The 8.0.x version of gdb has been removed. Use a newer
-	  version instead.
+comment "Legacy options removed in 2019.05"

 config BR2_KERNEL_HEADERS_4_20
 	bool "kernel headers version 4.20.x are no longer supported"
@@ -387,24 +153,6 @@ config BR2_KERNEL_HEADERS_4_20
 	  Version 4.20.x of the Linux kernel headers are no longer
 	  maintained upstream and are now removed.

-config BR2_KERNEL_HEADERS_5_0
-	bool "kernel headers version 5.0.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.0.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-comment "Legacy options removed in 2019.05"
-
-config BR2_CSKY_DSP
-	bool "C-SKY DSP support removed"
-	select BR2_LEGACY
-	help
-	  C-SKY DSP instruction support for ck810 / ck807 was removed,
-	  as it was no longer supported in C-SKY gcc. Perhaps the VDSP
-	  instructions should be used instead, using the BR2_CSKY_VDSP
-	  option.
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
 	bool "compositor moved to gst1-plugins-base"
 	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR
--- a/270
+++ b/270
@@ -47,25 +47,17 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/libwebsockets/
-F:	package/mender-grubenv/
 F:	package/nginx-naxsi/
 F:	package/openjdk/
 F:	package/openjdk-bin/
 F:	package/php/
 F:	package/policycoreutils/
 F:	package/python3/
-F:	package/python-aioredis/
-F:	package/python-asgiref/
-F:	package/python-channels/
-F:	package/python-channels-redis/
-F:	package/python-daphne/
-F:	package/python-django-enumfields/
 F:	package/python-flask-sqlalchemy/
 F:	package/python-mutagen/
 F:	package/python-pip/
 F:	package/python-psycopg2/
 F:	package/python-sqlalchemy/
-F:	package/python-sqlparse/
 F:	package/python-visitor/
 F:	package/restorecond/
 F:	package/refpolicy/
@@ -75,9 +67,6 @@ F:	package/setools/
 F:	package/sngrep/
 F:	package/systemd/

-N:	Adam Heinrich <adam@adamh.cz>
-F:	package/jack1/
-
 N:	Adrian Perez de Castro <aperez@igalia.com>
 F:	package/brotli/
 F:	package/cog/
@@ -110,12 +99,12 @@ F:	package/fastd/
 F:	package/libuecc/
 F:	package/putty/

-N:	Alexander Kurz <akurz@blala.de>
-F:	package/minimodem/
-
 N:	Alexander Lukichev <alexander.lukichev@espotel.com>
 F:	package/openpgm/

+N:	Alexander Mukhin <alexander.i.mukhin@gmail.com>
+F:	package/hostapd/
+
 N:	Alexander Sverdlin <alexander.sverdlin@gmail.com>
 F:	package/mini-snmpd/

@@ -129,14 +118,8 @@ N:	Alexandre Esse <alexandre.esse.dev@gmail.com>
 F:	package/kvazaar/
 F:	package/v4l2loopback/

-N:	Alexey Brodkin <alexey.brodkin@synopsys.com>
-F:	board/cubietech/cubieboard2/
-F:	configs/cubieboard2_defconfig
-
 N:	Alistair Francis <alistair@alistair23.me>
-F:	board/sifive/
 F:	boot/opensbi/
-F:	configs/hifive_unleashed_defconfig
 F:	package/xen/

 N:	Alvaro G. M <alvaro.gamez@hazent.com>
@@ -183,10 +166,7 @@ F:	package/monolite/
 F:	package/python-can/
 F:	package/python-pillow/
 F:	package/python-pydal/
-F:	package/python-spidev/
 F:	package/python-web2py/
-F:	package/sshguard/
-F:	package/sunwait/
 F:	package/sysdig/

 N:	Anisse Astier <anisse@astier.eu>
@@ -236,13 +216,10 @@ N:	Asaf Kahlon <asafka7@gmail.com>
 F:	package/collectd/
 F:	package/libuv/
 F:	package/python*
-F:	package/snmpclitools/
-F:	package/spdlog/
 F:	package/uftp/
-F:	package/uvw/
 F:	package/zeromq/

-N:	Ash Charles <ashcharles@gmail.com>
+N:	Ash Charles <ash.charles@savoirfairelinux.com>
 F:	package/pru-software-support/
 F:	package/ti-cgt-pru/

@@ -257,7 +234,6 @@ F:	package/orbit/

 N:	Bartosz Bilas <b.bilas@grinn-global.com>
 F:	package/qt5/qt5scxml/
-F:	package/qt5/qt5webview/

 N:	Bartosz Golaszewski <brgl@bgdev.pl>
 F:	package/autoconf-archive/
@@ -271,8 +247,6 @@ F:	package/pulseview/
 F:	package/sigrok-cli/

 N:	Baruch Siach <baruch@tkos.co.il>
-F:	board/solidrun/clearfog_gt_8k/
-F:	configs/solidrun_clearfog_gt_8k_defconfig
 F:	package/18xx-ti-utils/
 F:	package/daemon/
 F:	package/dropbear/
@@ -299,11 +273,11 @@ F:	package/alsa-utils/
 F:	package/apache/
 F:	package/apr/
 F:	package/apr-util/
+F:	package/asterisk/
 F:	package/bcg729/
 F:	package/bluez-tools/
 F:	package/boinc/
 F:	package/clamav/
-F:	package/dav1d/
 F:	package/dovecot/
 F:	package/dovecot-pigeonhole/
 F:	package/dtv-scan-tables/
@@ -311,16 +285,12 @@ F:	package/eudev/
 F:	package/exim/
 F:	package/fetchmail/
 F:	package/ffmpeg/
-F:	package/flac/
 F:	package/freeswitch/
 F:	package/freeswitch-mod-bcg729/
-F:	package/freetype/
-F:	package/fstrcmp/
 F:	package/ghostscript/
 F:	package/giflib/
 F:	package/gli/
 F:	package/glmark2/
-F:	package/gpsd/
 F:	package/hdparm/
 F:	package/jsoncpp/
 F:	package/kodi*
@@ -353,7 +323,6 @@ F:	package/libilbc/
 F:	package/libldns/
 F:	package/libmicrohttpd/
 F:	package/libminiupnpc/
-F:	package/libmspack/
 F:	package/libnatpmp/
 F:	package/libnpth/
 F:	package/libogg/
@@ -405,7 +374,6 @@ F:	package/perl-www-robotrules/
 F:	package/pixman/
 F:	package/pngquant/
 F:	package/pound/
-F:	package/pulseaudio/
 F:	package/pure-ftpd/
 F:	package/python-couchdb/
 F:	package/python-cssutils/
@@ -424,14 +392,12 @@ F:	package/samba4/
 F:	package/softether/
 F:	package/spandsp/
 F:	package/sqlite/
-F:	package/stellarium/
 F:	package/taglib/
 F:	package/tinyxml2/
 F:	package/tor/
 F:	package/transmission/
 F:	package/tvheadend/
 F:	package/unixodbc/
-F:	package/utf8proc/
 F:	package/vdr/
 F:	package/vdr-plugin-vnsiserver/
 F:	package/vlc/
@@ -440,7 +406,6 @@ F:	package/waylandpp/
 F:	package/x11r7/
 F:	package/x264/
 F:	package/x265/
-F:	package/ytree/
 F:	package/znc/

 N:	Biagio Montaruli <biagio.hkr@gmail.com>
@@ -461,13 +426,10 @@ N:	Brock Williams <brock@cottonwoodcomputer.com>
 F:	package/pdmenu/

 N:	Carlo Caione <carlo.caione@gmail.com>
-F:	package/jailhouse/
 F:	package/sunxi-boards/

 N:	Carlos Santos <unixmania@gmail.com>
 F:	package/busybox/
-F:	package/cups/
-F:	package/cups-filters/
 F:	package/gtest/
 F:	package/initscripts/
 F:	package/intel-microcode/
@@ -511,6 +473,7 @@ F:	configs/olimex_a13_olinuxino_defconfig
 F:	configs/orangepi_plus_defconfig

 N:	Chris Packham <judge.packham@gmail.com>
+F:	package/eventlog/
 F:	package/gstreamer1/gst1-shark/
 F:	package/micropython/
 F:	package/micropython-lib/
@@ -535,12 +498,6 @@ F:	package/rtl8821au/
 F:	package/runc/
 F:	package/tini/

-N:	Christophe Priouzeau <christophe.priouzeau@st.com>
-F:	board/stmicroelectronics/stm32f429-disco/
-F:	board/stmicroelectronics/stm32f469-disco/
-F:	configs/stm32f429_disco_defconfig
-F:	configs/stm32f469_disco_defconfig
-
 N:	Christophe Vu-Brugier <cvubrugier@fastmail.fm>
 F:	package/drbd-utils/
 F:	package/iotop/
@@ -592,6 +549,7 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/policycoreutils/
+F:	package/ustr/

 N:	Corentin Guillevic <corentin.guillevic@smile.fr>
 F:	package/libloki/
@@ -600,6 +558,13 @@ N:	Cyril Bur <cyrilbur@gmail.com>
 F:	arch/Config.in.powerpc
 F:	package/kvm-unit-tests

+N:	Dagg Stompler <daggs@gmx.com>
+F:	board/hardkernel/odroidc2
+F:	configs/odroidc2_defconfig
+F:	package/libamcodec/
+F:	package/odroid-mali/
+F:	package/odroid-scripts/
+
 N:	Daniel J. Leach <dleach@belcan.com>
 F:	package/dacapo/

@@ -610,6 +575,9 @@ F:	package/log4cpp/
 N:	Daniel Nicoletti <dantti12@gmail.com>
 F:	package/cutelyst/

+N:	Daniel Nyström <daniel.nystrom@timeterminal.se>
+F:	package/e2tools/
+
 N:	Daniel Price <daniel.price@gmail.com>
 F:	package/nodejs/
 F:	package/redis/
@@ -692,7 +660,6 @@ F:	package/eudev/
 F:	package/execline/
 F:	package/hicolor-icon-theme/
 F:	package/jemalloc/
-F:	package/mdevd/
 F:	package/meson/
 F:	package/ninja/
 F:	package/pkg-meson.mk
@@ -736,7 +703,6 @@ F:	package/szip/

 N:	Esben Haabendal <esben@haabendal.dk>
 F:	boot/gummiboot/
-F:	package/python-kiwisolver/

 N:	Etienne Carriere <etienne.carriere@linaro.org>
 F:	boot/optee-os/
@@ -765,7 +731,6 @@ F:	package/rtl8723bs/
 F:	package/supertuxkart/

 N:	Fabio Estevam <festevam@gmail.com>
-F:	board/freescale/warpboard/
 F:	board/warp7/
 F:	configs/freescale_imx*
 F:	configs/imx23evk_defconfig
@@ -784,16 +749,12 @@ F:	configs/mx6sx_udoo_neo_defconfig
 F:	configs/mx6udoo_defconfig
 F:	configs/wandboard_defconfig
 F:	configs/warp7_defconfig
-F:	configs/warpboard_defconfig
 F:	package/atest/
 F:	package/kmscube/

 N:	Fabio Porcedda <fabio.porcedda@gmail.com>
 F:	package/netsurf-buildsystem/

-N:	Fabio Urquiza <fabiorush@gmail.com>
-F:	package/bitcoin/
-
 N:	Fabrice Fontaine <fabrice.fontaine@orange.com>
 F:	package/domoticz/
 F:	package/libmediaart/
@@ -801,6 +762,10 @@ F:	package/libmaxminddb/
 F:	package/openzwave/

 N:	Fabrice Fontaine <fontaine.fabrice@gmail.com>
+F:	package/alljoyn/
+F:	package/alljoyn-base/
+F:	package/alljoyn-tcl/
+F:	package/alljoyn-tcl-base/
 F:	package/boinc/
 F:	package/cairo/
 F:	package/duktape/
@@ -884,16 +849,10 @@ F:	package/ser2net/

 N:	Francois Perrad <francois.perrad@gadz.org>
 F:	board/olimex/a20_olinuxino
-F:	board/olimex/imx233_olinuxino/
 F:	configs/olimex_a20_olinuxino_*
-F:	configs/olimex_imx233_olinuxino_defconfig
 F:	package/4th/
-F:	package/cgilua/
 F:	package/chipmunk/
 F:	package/cog/
-F:	package/collectl/
-F:	package/copas/
-F:	package/coxpcall/
 F:	package/dado/
 F:	package/ficl/
 F:	package/libtomcrypt/
@@ -912,14 +871,11 @@ F:	package/netsurf/
 F:	package/perl*
 F:	package/pkg-perl.mk
 F:	package/pkg-luarocks.mk
-F:	package/rings/
 F:	package/tekui/
 F:	package/wpebackend-fdo/
 F:	package/wpewebkit/
-F:	package/wsapi/
 F:	package/wsapi-fcgi/
 F:	package/wsapi-xavante/
-F:	package/xavante/
 F:	utils/scancpan

 N:	Frank Hunleth <fhunleth@troodon-software.com>
@@ -958,32 +914,18 @@ N:	Geoffrey Ragot <geoffreyragot@gmail.com>
 F:	package/python-pycli/
 F:	package/python-pyyaml/

-N:	Gerome Burlats <gerome.burlats@smile.fr>
-F:	board/qemu/
-F:	configs/qemu_*
-
 N:	Gilles Talis <gilles.talis@gmail.com>
-F:	board/freescale/imx8mmevk/
-F:	configs/freescale_imx8mmevk_defconfig
 F:	package/fdk-aac/
 F:	package/httping/
 F:	package/iozone/
 F:	package/leptonica/
-F:	package/libeXosip2/
-F:	package/libolm/
-F:	package/libosip2/
 F:	package/ocrad/
-F:	package/restclient-cpp/
 F:	package/tesseract-ocr/
 F:	package/webp/
 F:	package/xapian/

 N:	Giulio Benetti <giulio.benetti@benettiengineering.com>
-F:	package/at/
-F:	package/libnspr/
-F:	package/libnss/
 F:	package/minicom/
-F:	package/nfs-utils/
 F:	package/sunxi-mali-mainline/
 F:	package/sunxi-mali-mainline-driver/

@@ -1002,15 +944,10 @@ F:	package/bluez5_utils-headers/
 F:	package/f2fs-tools/
 F:	package/pigpio/
 F:	package/python-aioblescan/
-F:	package/python-bluezero/
 F:	package/python-falcon/
-F:	package/python-ifaddr/
-F:	package/python-hiredis/
 F:	package/python-mimeparse/
 F:	package/python-pigpio/
 F:	package/python-pyjwt/
-F:	package/python-redis/
-F:	package/python-rpi-ws281x/
 F:	package/python-wtforms/

 N:	Guillaume Gardet <guillaume.gardet@oliseo.fr>
@@ -1026,9 +963,7 @@ F:	package/reaver/
 N:	Guo Ren <ren_guo@c-sky.com>
 F:	arch/Config.in.csky
 F:	board/csky/
-F:	board/qemu/csky
 F:	configs/csky_*
-F:	configs/qemu_csky*

 N:	Gustavo Pimentel <gustavo.pimentel@synopsys.com>
 F:	configs/arm_juno_defconfig
@@ -1044,11 +979,6 @@ F:	package/python-markdown/
 F:	package/python-remi/
 F:	package/python-sip/

-N:	Heiko Thiery <heiko.thiery@gmail.com>
-F:	package/libnetconf2/
-F:	package/libyang/
-F:	package/sysrepo/
-
 N:	Henrique Camargo <henrique@henriquecamargo.com>
 F:	package/json-glib/

@@ -1127,7 +1057,6 @@ F:	package/python-aiomonitor/
 F:	package/python-aiojobs/
 F:	package/python-aiorwlock/
 F:	package/python-async-timeout/
-F:	package/python-brotli/
 F:	package/python-cchardet/
 F:	package/python-multidict/
 F:	package/python-pycares/
@@ -1155,9 +1084,6 @@ F:	configs/orangepi_lite_defconfig
 N:	Jan Kundrát <jan.kundrat@cesnet.cz>
 F:	configs/solidrun_clearfog_defconfig
 F:	board/solidrun/clearfog/
-F:	package/libnetconf2/
-F:	package/libyang/
-F:	package/sysrepo/

 N:	Jan Pedersen <jp@jp-embedded.com>
 F:	package/zip/
@@ -1200,7 +1126,6 @@ F:	package/x11r7/xdriver_xf86-video-imx/
 F:	package/x11r7/xdriver_xf86-video-imx-viv/

 N:	Joel Carlson <JoelsonCarl@gmail.com>
-F:	package/c-capnproto/
 F:	package/capnproto/
 F:	package/cmocka/
 F:	package/flatcc/
@@ -1210,8 +1135,6 @@ N:	Joel Stanley <joel@jms.id.au>
 F:	package/pdbg/
 F:	board/qemu/ppc64le-pseries/
 F:	configs/qemu_ppc64le_pseries_defconfig
-F:	board/qemu/ppc-mac99/
-F:	configs/qemu_ppc_mac99_defconfig

 N:	Johan Derycke <johanderycke@gmail.com>
 F:	package/python-libconfig/
@@ -1239,9 +1162,6 @@ F:	package/nginx-dav-ext/
 N:	John Stile <johns@msli.com>
 F:	package/dhcpcd/

-N:	John Faith <jfaith@impinj.com>
-F:	package/python-inflection/
-
 N:	Jonathan Ben Avraham <yba@tkos.co.il>
 F:	arch/Config.in.xtensa
 F:	package/autofs/
@@ -1251,16 +1171,15 @@ F:	package/phidgetwebservice/
 F:	package/rapidxml/
 F:	package/sphinxbase/

-N:	Joris Offouga <offougajoris@gmail.com>
-F:	package/python-colorlog/
-F:	package/python-simplelogging/
+N:	Jonathan Liu <net147@gmail.com>
+F:	package/python-meld3/
+F:	package/supervisor/

 N:	Jörg Krause <joerg.krause@embedded.rocks>
 F:	board/lemaker/bananapro/
 F:	configs/bananapro_defconfig
 F:	package/augeas/
 F:	package/bluez-alsa/
-F:	package/caps/
 F:	package/freescale-imx/imx-alsa-plugins/
 F:	package/libopusenc/
 F:	package/libupnpp/
@@ -1286,7 +1205,6 @@ F:	package/at-spi2-core/
 F:	package/clang/
 F:	package/gconf/
 F:	package/libnss/
-F:	package/lld/
 F:	package/llvm/
 F:	package/python-cython/
 F:	package/python-raven/
@@ -1298,10 +1216,6 @@ F:	package/python-xlib/
 N:	Joshua Henderson <joshua.henderson@microchip.com>
 F:	package/qt5/qt5wayland/

-N:	Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
-F:	package/python-cycler/
-F:	package/python-matplotlib/
-
 N:	Juha Rantanen <juha@codercoded.com>
 F:	package/acsccid/

@@ -1331,9 +1245,7 @@ N:	Julien Grossholtz <julien.grossholtz@openest.io>
 F:	package/paho-mqtt-c

 N:	Julien Olivain <juju@cotds.org>
-F:	board/technexion/imx8mmpico/
 F:	board/technexion/imx8mpico/
-F:	configs/imx8mmpico_defconfig
 F:	configs/imx8mpico_defconfig

 N:	Julien Viard de Galbert <julien@vdg.name>
@@ -1394,11 +1306,6 @@ F:	package/ti-sgx-demos/
 F:	package/ti-sgx-km/
 F:	package/ti-sgx-um/

-N:	Louis Aussedat <aussedat.louis@gmail.com>
-F:	board/friendlyarm/nanopi-neo-plus2/
-F:	configs/friendlyarm_nanopi_neo_plus2_defconfig
-F:	package/python-tqdm/
-
 N:	Louis-Paul Cordier <lpdev@cordier.org>
 F:	package/intel-gmmlib/
 F:	package/intel-mediadriver/
@@ -1409,9 +1316,7 @@ F:	board/olimex/a20_olinuxino/
 F:	board/zynq/
 F:	board/zynqmp/
 F:	configs/olimex_a20_olinuxino_*
-F:	configs/zynq_microzed_defconfig
 F:	configs/zynq_zed_defconfig
-F:	configs/zynq_zc706_defconfig
 F:	configs/zynqmp_zcu106_defconfig
 F:	package/agentpp/
 F:	package/exim/
@@ -1464,7 +1369,6 @@ F:	package/easydbus/
 F:	package/lua-flu/
 F:	package/lua-stdlib/
 F:	package/luaossl/
-F:	package/murata-cyw-fw/
 F:	package/rs485conf/
 F:	package/turbolua/

@@ -1490,11 +1394,12 @@ F:	package/lynx/
 N:	Mario Rugiero <mrugiero@gmail.com>
 F:	package/ratpoison/

-N:	Mark Corbin <mark@dibsco.co.uk>
+N:	Mark Corbin <mark.corbin@embecosm.com>
 F:	arch/arch.mk.riscv
 F:	arch/Config.in.riscv
 F:	board/qemu/riscv32-virt/
 F:	board/qemu/riscv64-virt/
+F:	boot/riscv-pk/
 F:	configs/qemu_riscv32_virt_defconfig
 F:	configs/qemu_riscv64_virt_defconfig

@@ -1541,6 +1446,7 @@ F:	package/cgroupfs-mount/
 F:	package/crda/
 F:	package/cunit/
 F:	package/dacapo/
+F:	package/devmem2/
 F:	package/dnsmasq/
 F:	package/dosfstools/
 F:	package/eigen/
@@ -1558,7 +1464,6 @@ F:	package/iperf/
 F:	package/iperf3/
 F:	package/iputils/
 F:	package/iw/
-F:	package/jitterentropy-library/
 F:	package/kvm-unit-tests/
 F:	package/kvmtool/
 F:	package/libcsv/
@@ -1588,16 +1493,11 @@ F:	package/policycoreutils/
 F:	package/proftpd/
 F:	package/protobuf-c/
 F:	package/protobuf/
-F:	package/python-colorama/
 F:	package/python-flask-cors/
-F:	package/python-iptables/
 F:	package/python-ipy/
 F:	package/python-posix-ipc/
-F:	package/python-pycairo/
 F:	package/python-pypcap/
 F:	package/python-pyrex/
-F:	package/python-tinyrpc/
-F:	package/python-txdbus/
 F:	package/raptor/
 F:	package/rcw/
 F:	package/rng-tools/
@@ -1678,10 +1578,6 @@ F:	board/arcturus/
 F:	configs/arcturus_ucp1020_defconfig
 F:	configs/arcturus_ucls1012a_defconfig

-N:	Michael Fischer <mf@go-sys.de>
-F:	package/gnuplot/
-F:	package/sdl2/
-
 N:	Michael Rommel <rommel@layer-7.net>
 F:	package/knock/
 F:	package/python-crc16/
@@ -1690,20 +1586,11 @@ F:	package/python-pyzmq/
 N:	Michael Trimarchi <michael@amarulasolutions.com>
 F:	package/python-spidev/

-N:	Michael Vetter <jubalh@iodoru.org>
-F:	package/jasper/
-
-N:	Michael Walle <michael@walle.cc>
-F:	package/libavl/
-
 N:	Michał Łyszczek <michal.lyszczek@bofc.pl>
 F:	board/altera/socrates_cyclone5/
 F:	board/pine64/rock64
 F:	configs/rock64_defconfig
 F:	configs/socrates_cyclone5_defconfig
-F:	package/netifrc/
-F:	package/openrc/
-F:	package/skeleton-init-openrc/

 N:	Michel Stempin <michel.stempin@wanadoo.fr>
 F:	board/licheepi/
@@ -1723,6 +1610,9 @@ N:	Mirza Krak <mirza.krak@northern.tech>
 F:	package/mender/
 F:	package/mender-artifact/

+N:	Morgan Delestre <m.delestre@sinters.fr>
+F:	package/monkey/
+
 N:	Murat Demirten <mdemirten@yh.com.tr>
 F:	package/jpeg-turbo/
 F:	package/libgeotiff/
@@ -1738,9 +1628,6 @@ N:	Naumann Andreas <ANaumann@ultratronik.de>
 F:	package/evemu/
 F:	package/libevdev/

-N:	Nicola Di Lieto <nicola.dilieto@gmail.com>
-F:	package/uacme/
-
 N:	Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
 F:	package/libgit2/

@@ -1748,7 +1635,6 @@ N:	Nicolas Serafini <nicolas.serafini@sensefly.com>
 F:	package/exiv2/
 F:	package/nvidia-tegra23/nvidia-tegra23-binaries/
 F:	package/nvidia-tegra23/nvidia-tegra23-codecs/
-F:	package/ofono/

 N:	Nikolay Dimitrov <nikolay.dimitrov@retrohub.org>
 F:	board/embest/riotboard/
@@ -1816,17 +1702,13 @@ N:	Pedro Aguilar <paguilar@paguilar.org>
 F:	package/libunistring/

 N:	Peter Korsgaard <peter@korsgaard.com>
-F:	board/beagleboneai/
 F:	board/minnowboard/
-F:	board/librecomputer/lafrite/
 F:	board/nexbox/a95x/
 F:	board/openblocks/a6/
 F:	board/orangepi/
 F:	board/pandaboard/
 F:	board/roseapplepi/
 F:	boot/shim/
-F:	configs/beagleboneai_defconfig
-F:	configs/lafrite_defconfig
 F:	configs/minnowboard_max-graphical_defconfig
 F:	configs/minnowboard_max_defconfig
 F:	configs/nexbox_a95x_defconfig
@@ -1839,10 +1721,8 @@ F:	configs/sheevaplug_defconfig
 F:	package/bats-core/
 F:	package/docker-compose/
 F:	package/dump1090/
-F:	package/fatcat/
 F:	package/flickcurl/
 F:	package/fscryptctl/
-F:	package/ifmetric/
 F:	package/jo/
 F:	package/jose/
 F:	package/libfastjson/
@@ -1871,12 +1751,10 @@ F:	package/python-websocket-client/
 F:	package/sedutil/
 F:	package/tpm2-totp/
 F:	package/triggerhappy/
-F:	package/wireguard/
-F:	support/testing/tests/package/test_docker_compose.py

 N:	Peter Seiderer <ps.report@gmx.net>
 F:	board/raspberrypi/
-F:	configs/raspberrypi*_defconfig
+F:	configs/raspberrypi3_defconfig
 F:	package/assimp/
 F:	package/bcm2835/
 F:	package/ddrescue/
@@ -1906,7 +1784,6 @@ N:	Petr Kulhavy <brain@jikos.cz>
 F:	package/linuxptp/

 N:	Petr Vorel <petr.vorel@gmail.com>
-F:	package/ima-evm-utils/
 F:	package/iproute2/
 F:	package/iputils/
 F:	package/linux-backports/
@@ -1940,22 +1817,6 @@ F:	package/kf5/
 N:	Pierre Floury <pierre.floury@gmail.com>
 F:	package/trace-cmd/

-N:	Pierre-Jean Texier <pjtexier@koncepto.io>
-F:	package/fping/
-F:	package/genimage/
-F:	package/haveged/
-F:	package/libarchive/
-F:	package/libevent/
-F:	package/libubootenv/
-F:	package/libxml2/
-F:	package/mongoose/
-F:	package/mxml/
-F:	package/numactl/
-F:	package/python-periphery/
-F:	package/sbc/
-F:	package/stunnel/
-F:	package/tree/
-
 N:	Pieter De Gendt <pieter.degendt@gmail.com>
 F:	package/libvips/

@@ -1964,9 +1825,8 @@ F:	package/libdvbpsi/
 F:	package/mraa/
 F:	package/synergy/

-N:	Rafal Susz <rafal.susz@gmail.com>
-F:	board/avnet/s6lx9_microboard/
-F:	configs/s6lx9_microboard_defconfig
+N:	Qais Yousef <Qais.Yousef@imgtec.com>
+F:	package/bellagio/

 N:	Rahul Bedarkar <rahulbedarkar89@gmail.com>
 F:	package/cxxtest/
@@ -2005,7 +1865,6 @@ F:	support/testing/tests/download/
 F:	support/testing/tests/package/*_python*.py
 F:	support/testing/tests/package/test_atop.py
 F:	support/testing/tests/package/test_syslog_ng.py
-F:	support/testing/tests/package/test_tmux.py
 F:	support/testing/tests/utils/test_check_package.py
 F:	utils/check-package
 F:	utils/checkpackagelib/
@@ -2014,6 +1873,10 @@ N:	Richard Braun <rbraun@sceen.net>
 F:	package/curlftpfs/
 F:	package/tzdata/

+N:	Rico Bachmann <bachmann@tofwerk.com>
+F:	package/apr-util/
+F:	package/subversion/
+
 N:	RJ Ascani <rj.ascani@gmail.com>
 F:	package/azmq/

@@ -2027,34 +1890,25 @@ F:	package/vnstat/

 N:	Romain Naour <romain.naour@gmail.com>
 F:	package/aubio/
-F:	package/binutils/
 F:	package/bullet/
-F:	package/clang/
-F:	package/clinfo/
 F:	package/efl/
 F:	package/enet/
 F:	package/enlightenment/
 F:	package/flare-engine/
 F:	package/flare-game/
-F:	package/gcc/
-F:	package/glibc/
 F:	package/irrlicht/
 F:	package/liblinear/
 F:	package/lensfun/
-F:	package/libclc/
 F:	package/libgta/
 F:	package/libspatialindex/
 F:	package/linux-syscall-support/
-F:	package/llvm/
 F:	package/lugaru/
 F:	package/mcelog/
 F:	package/mesa3d/
 F:	package/minetest/
 F:	package/minetest-game/
-F:	package/ogre/
 F:	package/openpowerlink/
 F:	package/physfs/
-F:	package/piglit/
 F:	package/solarus/
 F:	package/stress-ng/
 F:	package/supertux/
@@ -2064,9 +1918,9 @@ F:	package/tk/
 F:	package/upower/
 F:	package/waffle/
 F:	package/xenomai/
-F:	package/zziplib/
-F:	support/testing/tests/package/test_glxinfo.py
-F:	toolchain/
+F:	toolchain/toolchain-external/toolchain-external-arm-aarch64/
+F:	toolchain/toolchain-external/toolchain-external-arm-aarch64-be/
+F:	toolchain/toolchain-external/toolchain-external-arm-arm/

 N:	Roman Gorbenkov <roman.gorbenkov@ens2m.org>
 F:	package/davfs2/
@@ -2077,6 +1931,7 @@ F:	package/miraclecast/
 F:	package/python-pyasn/
 F:	package/python-pycrypto/
 F:	package/python-pysnmp/
+F:	package/python-pysnmp-apps/
 F:	package/python-pysnmp-mibs/
 F:	package/python-tornado/
 F:	package/websocketpp/
@@ -2089,8 +1944,9 @@ F:	package/mariadb/
 N:	Ryan Wilkins <ryan@deadfrog.net>
 F:	package/biosdevname/

-N:	Sam Lancia <sam@gpsm.co.uk>
-F:	package/lrzip/
+N:	Sam Bobroff <sam.bobroff@au1.ibm.com>
+F:	arch/Config.in.powerpc
+F:	package/librtas/

 N:	Samuel Martin <s.martin49@gmail.com>
 F:	package/armadillo/
@@ -2109,9 +1965,6 @@ F:	package/urg/
 F:	package/ussp-push/
 F:	support/misc/toolchainfile.cmake.in

-N:	Sam Voss <sam.voss@gmail.com>
-F:	package/ripgrep/
-
 N:	Santosh Multhalli <santosh.multhalli@rockwellcollins.com>
 F:	package/valijson/

@@ -2147,14 +2000,10 @@ F:	configs/orangepi_zero_defconfig
 F:	configs/solidrun_macchiatobin_mainline_defconfig
 F:	configs/solidrun_macchiatobin_marvell_defconfig
 F:	package/armbian-firmware/
-F:	package/hostapd/
 F:	package/rtl8189fs/
-F:	package/wpa_supplicant/
 F:	package/xr819-xradio/

 N:	Sergio Prado <sergio.prado@e-labworks.com>
-F:	board/toradex/apalis-imx6/
-F:	configs/toradex_apalis_imx6_defconfig
 F:	package/aoetools/
 F:	package/curlpp/
 F:	package/daq/
@@ -2221,9 +2070,6 @@ F:	package/gtest/
 F:	package/mtdev/
 F:	package/mtdev2tuio/

-N:	Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net>
-F:	package/libhttpserver/
-
 N:	Steve Calfee <stevecalfee@gmail.com>
 F:	package/python-pymysql/
 F:	package/python-pyratemp/
@@ -2249,6 +2095,13 @@ N:	Sven Haardiek <sven.haardiek@iotec-gmbh.de>
 F:	package/lcdproc/
 F:	package/python-influxdb/

+N:	Sven Neumann <neumann@teufel.de>
+F:	package/glib-networking/
+F:	package/gstreamer1/gst1-libav/
+F:	package/libmms/
+F:	package/orc/
+F:	package/wampcc/
+
 N:	Sven Oliver Moll <svolli@svolli.de>
 F:	package/most/

@@ -2264,7 +2117,6 @@ F:	package/x265/

 N:	Thomas Claveirole <thomas.claveirole@green-communications.fr>
 F:	package/fcgiwrap/
-F:	package/openlayers/

 N:	Thomas Davis <sunsetbrew@sunsetbrew.com>
 F:	package/civetweb/
@@ -2288,16 +2140,11 @@ F:	support/scripts/size-stats
 F:	utils/size-stats-compare
 F:	toolchain/

-N:	Thomas Huth <huth@tuxfamily.org>
-F:	package/ascii-invaders/
-
 N:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 F:	arch/Config.in.arm
-F:	board/stmicroelectronics/stm32mp157c-dk2/
 F:	boot/boot-wrapper-aarch64/
 F:	boot/grub2/
 F:	boot/gummiboot/
-F:	configs/stm32mp157c_dk2_defconfig
 F:	package/android-tools/
 F:	package/b43-firmware/
 F:	package/b43-fwcutter/
@@ -2330,7 +2177,6 @@ F:	package/monit/
 F:	package/mpdecimal/
 F:	package/msmtp/
 F:	package/musl/
-F:	package/musl-fts/
 F:	package/ne10/
 F:	package/pkg-python.mk
 F:	package/pkg-autotools.mk
@@ -2353,10 +2199,6 @@ F:	toolchain/
 N:	Timo Ketola <timo.ketola@exertus.fi>
 F:	package/fbgrab/

-N:	Titouan Christophe <titouan.christophe@railnova.eu>
-F:	package/mosquitto/
-F:	package/redis/
-
 N:	Trent Piepho <tpiepho@impinj.com>
 F:	package/libp11/

@@ -2377,9 +2219,6 @@ F:	package/llvm/
 N:	Vanya Sergeev <vsergeev@gmail.com>
 F:	package/lua-periphery/

-N:	Victor Huesca <victor.huesca@bootlin.com>
-F:	support/testing/tests/core/test_root_password.py
-
 N:	Vincent Prince <vincent.prince.fr@gmail.com>
 F:	package/nss-myhostname/
 F:	package/utp_com/
@@ -2427,8 +2266,6 @@ N:	Wojciech Niziński <niziak@spox.org>
 F:	package/fwup/

 N:	Yann E. MORIN <yann.morin.1998@free.fr>
-F:	board/friendlyarm/nanopi-neo/
-F:	configs/nanopi_neo_defconfig
 F:	fs/squashfs/
 F:	package/asterisk/
 F:	package/cegui06/
@@ -2493,7 +2330,6 @@ F:	package/imlib2/
 F:	package/jquery-datetimepicker/
 F:	package/jquery-sidebar/
 F:	package/kmod/
-F:	package/libftdi1/
 F:	package/libical/
 F:	package/libmbim/
 F:	package/libndp/
@@ -2503,7 +2339,6 @@ F:	package/libsocketcan/
 F:	package/libubox/
 F:	package/libuci/
 F:	package/linux-firmware/
-F:	package/linux-serial-test/
 F:	package/modem-manager/
 F:	package/nftables/
 F:	package/nuttcp/
@@ -2513,7 +2348,6 @@ F:	package/poco/
 F:	package/python*
 F:	package/ser2net/
 F:	package/socketcand/
-F:	package/swig/
 F:	package/qt5/qt5serialbus/
 F:	package/sdparm/
 F:	package/ti-utils/
@@ -2525,8 +2359,6 @@ F:	utils/scanpypi
 N:	Zoltan Gyarmati <zgyarmati@zgyarmati.de>
 F:	package/crudini/
 F:	package/grantlee/
-F:	package/libusb/
-F:	package/libusb-compat/
 F:	package/proj/
 F:	package/python-configobj/
 F:	package/python-iniparse/
--- a/73
+++ b/73
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2006-2014 by the Buildroot developers <buildroot@uclibc.org>
-# Copyright (C) 2014-2020 by the Buildroot developers <buildroot@buildroot.org>
+# Copyright (C) 2014-2019 by the Buildroot developers <buildroot@buildroot.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2019.11.3
+export BR2_VERSION := 2019.05.3
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1586500000
+BR2_VERSION_EPOCH = 1570114000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -179,18 +179,16 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
 # still be overridden on the command line, therefore the file is re-created
 # every time make is run.

-BR2_EXTERNAL_FILE = $(BASE_DIR)/.br2-external.mk
+BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external.mk
 -include $(BR2_EXTERNAL_FILE)
-$(shell support/scripts/br2-external -d '$(BASE_DIR)' $(BR2_EXTERNAL))
+$(shell support/scripts/br2-external \
+	-m -o '$(BR2_EXTERNAL_FILE)' $(BR2_EXTERNAL))
 BR2_EXTERNAL_ERROR =
 include $(BR2_EXTERNAL_FILE)
 ifneq ($(BR2_EXTERNAL_ERROR),)
 $(error $(BR2_EXTERNAL_ERROR))
 endif

-# Workaround bug in make-4.3: https://savannah.gnu.org/bugs/?57676
-$(BASE_DIR)/.br2-external.mk:;
-
 # To make sure that the environment variable overrides the .config option,
 # set this before including .config.
 ifneq ($(BR2_DL_DIR),)
@@ -468,10 +466,6 @@ $(HOST_DIR_SYMLINK): $(BASE_DIR)
 	ln -snf $(HOST_DIR) $(BASE_DIR)/host
 endif

-STAGING_DIR_SYMLINK = $(BASE_DIR)/staging
-$(STAGING_DIR_SYMLINK): $(BASE_DIR)
-	ln -snf $(STAGING_DIR) $(STAGING_DIR_SYMLINK)
-
 # Quotes are needed for spaces and all in the original PATH content.
 BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)"

@@ -737,12 +731,16 @@ target-finalize: ROOTFS=
 host-finalize: $(HOST_DIR_SYMLINK)

 .PHONY: staging-finalize
-staging-finalize: $(STAGING_DIR_SYMLINK)
+staging-finalize:
+	@ln -snf $(STAGING_DIR) $(BASE_DIR)/staging

 .PHONY: target-finalize
 target-finalize: $(PACKAGES) host-finalize
 	@$(call MESSAGE,"Finalizing target directory")
 	# Check files that are touched by more than one package
+	./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
+	./support/scripts/check-uniq-files -t staging $(BUILD_DIR)/packages-file-list-staging.txt
+	./support/scripts/check-uniq-files -t host $(BUILD_DIR)/packages-file-list-host.txt
 	$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
 		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
@@ -810,16 +808,6 @@ endif # merged /usr

 	touch $(TARGET_DIR)/usr

-# AFTER ALL FILE-CHANGING ACTIONS:
-# Update timestamps in internal file list to fix attribution of files
-# to packages on subsequent builds
-	$(call step_pkg_size_file_list,$(TARGET_DIR))
-	$(call step_pkg_size_finalize)
-	$(call step_pkg_size_file_list,$(STAGING_DIR),-staging)
-	$(call step_pkg_size_finalize,-staging)
-	$(call step_pkg_size_file_list,$(HOST_DIR),-host)
-	$(call step_pkg_size_finalize,-host)
-
 .PHONY: target-post-image
 target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
 	@rm -f $(ROOTFS_COMMON_TAR)
@@ -905,8 +893,7 @@ graph-size:
 	$(Q)$(TOPDIR)/support/scripts/size-stats --builddir $(BASE_DIR) \
 		--graph $(GRAPHS_DIR)/graph-size.$(BR_GRAPH_OUT) \
 		--file-size-csv $(GRAPHS_DIR)/file-size-stats.csv \
-		--package-size-csv $(GRAPHS_DIR)/package-size-stats.csv \
-		$(BR2_GRAPH_SIZE_OPTS)
+		--package-size-csv $(GRAPHS_DIR)/package-size-stats.csv

 .PHONY: check-dependencies
 check-dependencies:
@@ -947,6 +934,9 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 HOSTCFLAGS = $(CFLAGS_FOR_BUILD)
 export HOSTCFLAGS

+.PHONY: prepare-kconfig
+prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in
+
 $(BUILD_DIR)/buildroot-config/%onf:
 	mkdir -p $(@D)/lxdialog
 	PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" $(MAKE) CC="$(HOSTCC_NOCCACHE)" HOSTCC="$(HOSTCC_NOCCACHE)" \
@@ -963,22 +953,22 @@ COMMON_CONFIG_ENV = \
 	KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \
 	BR2_CONFIG=$(BR2_CONFIG) \
 	HOST_GCC_VERSION="$(HOSTCC_VERSION)" \
-	BASE_DIR=$(BASE_DIR) \
+	BUILD_DIR=$(BUILD_DIR) \
 	SKIP_LEGACY=

-xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile
+xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)

-gconfig: $(BUILD_DIR)/buildroot-config/gconf outputmakefile
+gconfig: $(BUILD_DIR)/buildroot-config/gconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) srctree=$(TOPDIR) $< $(CONFIG_CONFIG_IN)

-menuconfig: $(BUILD_DIR)/buildroot-config/mconf outputmakefile
+menuconfig: $(BUILD_DIR)/buildroot-config/mconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)

-nconfig: $(BUILD_DIR)/buildroot-config/nconf outputmakefile
+nconfig: $(BUILD_DIR)/buildroot-config/nconf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)

-config: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN)

 # For the config targets that automatically select options, we pass
@@ -986,11 +976,11 @@ config: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 # 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 outputmakefile
+randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --$@ $(CONFIG_CONFIG_IN)
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null

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

-oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --$@ $(CONFIG_CONFIG_IN)

-defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)

 define percent_defconfig
 # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig
-%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile
+%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig prepare-kconfig
 	@$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \
 		$$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN)
 endef
@@ -1014,7 +1004,7 @@ $(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent

 update-defconfig: savedefconfig

-savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
+savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< \
 		--savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \
 		$(CONFIG_CONFIG_IN)
@@ -1042,6 +1032,13 @@ ifeq ($(NEED_WRAPPER),y)
 	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif

+# Even though the target is a real file, we mark it as PHONY as we
+# want it to be re-generated each time make is invoked, in case the
+# value of BR2_EXTERNAL is changed.
+.PHONY: $(BUILD_DIR)/.br2-external.in
+$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
+	$(Q)support/scripts/br2-external -k -o "$(@)" $(BR2_EXTERNAL)
+
 # printvars prints all the variables currently defined in our
 # Makefiles. Alternatively, if a non-empty VARS variable is passed,
 # only the variables matching the make pattern passed in VARS are
@@ -1070,7 +1067,7 @@ ifeq ($(O),$(CURDIR)/output)
 	rm -rf $(O)
 endif
 	rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \
-		$(CONFIG_DIR)/.auto.deps $(BASE_DIR)/.br2-external.*
+		$(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE)

 .PHONY: help
 help:
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -77,10 +77,8 @@ config BR2_aarch64_be

 config BR2_csky
 	bool "csky"
+	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_ARCH_HAS_MMU_MANDATORY
-	# Most variants are supported by gcc-9+, except one that is
-	# handled as a special exception in package/gcc/Config.in.host
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
 	  http://www.c-sky.com/
@@ -304,10 +302,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7

-config BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -13,37 +13,13 @@ config BR2_arc770d

 config BR2_archs38
 	bool "ARC HS38"
-	help
-	  Generic ARC HS capable of running Linux, i.e. with MMU,
-	  caches and multiplier. Also it corresponds to the default
-	  configuration in older GNU toolchain versions.
-
-	  If you're not sure which version of ARC HS core you  build for
-	  keep this one.
-
-config BR2_archs38_full
-	bool "ARC HS38 with Quad MAC & FPU"
-	help
-	  Fully featured ARC HS with additional support for
-	   - Dual- and quad multiply and MC oprations
-	   - Double-precision FPU
-
-	  It corresponds to "hs38_slc_full" ARC HS template in
-	  ARChitect.
-
-config BR2_archs4x_rel31
-	bool "ARC HS48 rel 31"
-	help
-	   Latest release of HS48 processor
-	   - Dual- and quad multiply and MC oprations
-	   - Double-precision FPU

 endchoice

 # Choice of atomic instructions presence
 config BR2_ARC_ATOMIC_EXT
 	bool "Atomic extension (LLOCK/SCOND instructions)"
-	default y if BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	default y if BR2_arc770d || BR2_archs38

 config BR2_ARCH
 	default "arc"	if BR2_arcle
@@ -61,12 +37,10 @@ config BR2_GCC_TARGET_CPU
 	default "arc700" if BR2_arc750d
 	default "arc700" if BR2_arc770d
 	default "archs"	 if BR2_archs38
-	default "hs38_linux"	 if BR2_archs38_full
-	default "hs4x_rel31"	 if BR2_archs4x_rel31

 config BR2_READELF_ARCH_NAME
 	default "ARCompact"	if BR2_arc750d || BR2_arc770d
-	default "ARCv2"		if BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	default "ARCv2"		if BR2_archs38

 choice
 	prompt "MMU Page Size"
@@ -86,7 +60,7 @@ choice

 config BR2_ARC_PAGE_SIZE_4K
 	bool "4KB"
-	depends on BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	depends on BR2_arc770d || BR2_archs38

 config BR2_ARC_PAGE_SIZE_8K
 	bool "8KB"
@@ -96,7 +70,7 @@ config BR2_ARC_PAGE_SIZE_8K

 config BR2_ARC_PAGE_SIZE_16K
 	bool "16KB"
-	depends on BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31
+	depends on BR2_arc770d || BR2_archs38

 endchoice

@@ -105,6 +79,3 @@ config BR2_ARC_PAGE_SIZE
 	default "4K" if BR2_ARC_PAGE_SIZE_4K
 	default "8K" if BR2_ARC_PAGE_SIZE_8K
 	default "16K" if BR2_ARC_PAGE_SIZE_16K
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -367,13 +367,6 @@ config BR2_cortex_a73_a53
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_emag
-	bool "emag"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_exynos_m1
 	bool "exynos-m1"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -383,62 +376,50 @@ config BR2_exynos_m1
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+if BR2_ARCH_IS_64
 config BR2_falkor
 	bool "falkor"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
-config BR2_phecda
-	bool "phecda"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_qdf24xx
 	bool "qdf24xx"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_thunderx
-	bool "thunderx (aka octeontx)"
-	depends on BR2_ARCH_IS_64
+	bool "thunderx"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_thunderxt81
-	bool "thunderxt81 (aka octeontx81)"
-	depends on BR2_ARCH_IS_64
+	bool "thunderxt81"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt83
-	bool "thunderxt83 (aka octeontx83)"
-	depends on BR2_ARCH_IS_64
+	bool "thunderxt83"
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt88
 	bool "thunderxt88"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt88p1
 	bool "thunderxt88p1"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+endif # BR2_ARCH_IS_64
 config BR2_xgene1
 	bool "xgene1"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -449,94 +430,59 @@ config BR2_xgene1
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5

+if BR2_ARCH_IS_64
 comment "armv8.1a cores"
 config BR2_thunderx2t99
 	bool "thunderx2t99"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderx2t99p1
 	bool "thunderx2t99p1"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_vulcan
 	bool "vulcan"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+endif # BR2_ARCH_IS_64

+if BR2_ARCH_IS_64
 comment "armv8.2a cores"
 config BR2_cortex_a55
 	bool "cortex-A55"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 config BR2_cortex_a75
 	bool "cortex-A75"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 config BR2_cortex_a75_a55
 	bool "cortex-A75/A55 big.LITTLE"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_cortex_a76
-	bool "cortex-A76"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_cortex_a76_a55
-	bool "cortex-A76/A55 big.LITTLE"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_neoverse_n1
-	bool "neoverse-N1 (aka ares)"
-	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_tsv110
-	bool "tsv110"
-	depends on BR2_ARCH_IS_64
-	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8A
-	select BR2_ARCH_HAS_MMU_OPTIONAL
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
+endif # BR2_ARCH_IS_64

-comment "armv8.4a cores"
+if BR2_ARCH_IS_64
+comment "armv8.3a cores"
 config BR2_saphira
 	bool "saphira"
-	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
+endif # BR2_ARCH_IS_64
 endchoice

 config BR2_ARM_ENABLE_NEON
@@ -869,17 +815,12 @@ config BR2_GCC_TARGET_CPU
 	default "cortex-a73"	if BR2_cortex_a73
 	default "cortex-a73.cortex-a35"	if BR2_cortex_a73_a35
 	default "cortex-a73.cortex-a53"	if BR2_cortex_a73_a53
-	default "emag"		if BR2_emag
 	default "exynos-m1"	if BR2_exynos_m1
 	default "falkor"	if BR2_falkor
-	default "phecda"	if BR2_phecda
 	default "qdf24xx"	if BR2_qdf24xx
-	default "thunderx"	if BR2_thunderx && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "octeontx"	if BR2_thunderx && BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "thunderxt81"	if BR2_thunderxt81 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "octeontx81"	if BR2_thunderxt81 && BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "thunderxt83"	if BR2_thunderxt83 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-	default "octeontx83"	if BR2_thunderxt83 && BR2_TOOLCHAIN_GCC_AT_LEAST_9
+	default "thunderx"	if BR2_thunderx
+	default "thunderxt81"	if BR2_thunderxt81
+	default "thunderxt83"	if BR2_thunderxt83
 	default "thunderxt88"	if BR2_thunderxt88
 	default "thunderxt88p1"	if BR2_thunderxt88p1
 	default "xgene1"	if BR2_xgene1
@@ -891,11 +832,7 @@ config BR2_GCC_TARGET_CPU
 	default "cortex-a55"	if BR2_cortex_a55
 	default "cortex-a75"	if BR2_cortex_a75
 	default "cortex-a75.cortex-a55"	if BR2_cortex_a75_a55
-	default "cortex-a76"	if BR2_cortex_a76
-	default "cortex-a76.cortex-a55"	if BR2_cortex_a76_a55
-	default "neoverse-n1"	if BR2_neoverse_n1
-	default "tsv110"	if BR2_tsv110
-	# armv8.4a
+	# armv8.3a
 	default "saphira"	if BR2_saphira

 config BR2_GCC_TARGET_ABI
@@ -929,6 +866,3 @@ config BR2_GCC_TARGET_MODE
 config BR2_READELF_ARCH_NAME
 	default "ARM"		if BR2_arm || BR2_armeb
 	default "AArch64"	if BR2_aarch64 || BR2_aarch64_be
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.csky
+++ b/arch/Config.in.csky
@@ -5,8 +5,6 @@ choice
 	  Specific CPU variant to use

 config BR2_ck610
-	# Not supported by upstream gcc <= 9, and handled as a special
-	# exception in package/gcc/Config.in.host
 	bool "ck610"

 config BR2_ck807
@@ -15,26 +13,19 @@ config BR2_ck807
 config BR2_ck810
 	bool "ck810"

-config BR2_ck860
-	bool "ck860"
-
 endchoice

 config BR2_CSKY_FPU
 	bool "Enable FPU coprocessor"
-	depends on BR2_ck810 || BR2_ck807 || BR2_ck860
+	depends on BR2_ck810 || BR2_ck807
 	help
 	  You can say N here if your C-SKY CPU doesn't have a
 	  Floating-Point Coprocessor or if you don't need FPU support
 	  for your user-space programs.

-config BR2_CSKY_VDSP
-	bool "Enable VDSP enhanced instructions Co-processor"
-	depends on BR2_CSKY_FPU
-
-config BR2_GCC_TARGET_FLOAT_ABI
-	default "soft"		if !BR2_CSKY_FPU
-	default "hard"		if BR2_CSKY_FPU
+config BR2_CSKY_DSP
+	bool "Enable DSP enhanced instructions"
+	depends on BR2_ck810 || BR2_ck807

 config BR2_ARCH
 	default "csky"
@@ -42,8 +33,16 @@ config BR2_ARCH
 config BR2_ENDIAN
 	default "LITTLE"

+config BR2_GCC_TARGET_CPU
+	default "ck610"		if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807"		if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807e"	if (BR2_ck807 && !BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck807f"	if (BR2_ck807 &&  BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807ef"	if (BR2_ck807 &&  BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck810"		if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck810e"	if (BR2_ck810 && !BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck810f"	if (BR2_ck810 &&  BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck810ef"	if (BR2_ck810 &&  BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+
 config BR2_READELF_ARCH_NAME
 	default "CSKY"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.m68k
+++ b/arch/Config.in.m68k
@@ -38,6 +38,3 @@ config BR2_GCC_TARGET_CPU

 config BR2_READELF_ARCH_NAME
 	default "MC68000"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.microblaze
+++ b/arch/Config.in.microblaze
@@ -12,6 +12,3 @@ config BR2_READELF_ARCH_NAME
 config BR2_microblaze
 	bool
 	default y if BR2_microblazeel || BR2_microblazebe
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -271,6 +271,3 @@ config BR2_GCC_TARGET_ABI

 config BR2_READELF_ARCH_NAME
 	default "MIPS R3000"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.nds32
+++ b/arch/Config.in.nds32
@@ -9,6 +9,3 @@ config BR2_ENDIAN

 config BR2_READELF_ARCH_NAME
 	default "Andes Technology compact code size embedded RISC processor family"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.nios2
+++ b/arch/Config.in.nios2
@@ -6,6 +6,3 @@ config BR2_ENDIAN

 config BR2_READELF_ARCH_NAME
 	default "Altera Nios II"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.or1k
+++ b/arch/Config.in.or1k
@@ -6,6 +6,3 @@ config BR2_ENDIAN

 config BR2_READELF_ARCH_NAME
 	default "OpenRISC 1000"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -208,6 +208,3 @@ config BR2_GCC_TARGET_CPU
 config BR2_READELF_ARCH_NAME
 	default "PowerPC"	if BR2_powerpc
 	default "PowerPC64"	if BR2_powerpc64 || BR2_powerpc64le
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.riscv
+++ b/arch/Config.in.riscv
@@ -80,12 +80,8 @@ endchoice

 choice
 	prompt "Target ABI"
-	default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
-	default BR2_RISCV_ABI_ILP32F if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
-	default BR2_RISCV_ABI_ILP32  if !BR2_ARCH_IS_64
-	default BR2_RISCV_ABI_LP64D  if BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
-	default BR2_RISCV_ABI_LP64F  if BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
-	default BR2_RISCV_ABI_LP64   if BR2_ARCH_IS_64
+	default BR2_RISCV_ABI_ILP32 if !BR2_ARCH_IS_64
+	default BR2_RISCV_ABI_LP64 if BR2_ARCH_IS_64

 config BR2_RISCV_ABI_ILP32
 	bool "ilp32"
@@ -129,6 +125,3 @@ config BR2_GCC_TARGET_ABI

 config BR2_READELF_ARCH_NAME
 	default "RISC-V"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -30,6 +30,3 @@ config BR2_ENDIAN

 config BR2_READELF_ARCH_NAME
 	default "Renesas / SuperH SH"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -32,6 +32,3 @@ config BR2_GCC_TARGET_CPU
 config BR2_READELF_ARCH_NAME
 	default "Sparc"		if BR2_sparc
 	default "Sparc v9"	if BR2_sparc64
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -301,6 +301,3 @@ config BR2_GCC_TARGET_ARCH
 config BR2_READELF_ARCH_NAME
 	default "Intel 80386"			if BR2_i386
 	default "Advanced Micro Devices X86-64" if BR2_x86_64
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -50,6 +50,3 @@ config BR2_ARCH

 config BR2_READELF_ARCH_NAME
 	default "Tensilica Xtensa Processor"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--- a/arch/arch.mk.arc
+++ b/arch/arch.mk.arc
@@ -1,4 +0,0 @@
-# -matomic is always required when the ARC core has the atomic extensions
-ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy)
-ARCH_TOOLCHAIN_WRAPPER_OPTS = -matomic
-endif
--- a/arch/arch.mk.csky
+++ b/arch/arch.mk.csky
@@ -1,26 +0,0 @@
-#
-# Configure the GCC_TARGET_ARCH variable and append the
-# appropriate C-SKY ISA extensions.
-#
-
-ifeq ($(BR2_csky),y)
-
-ifeq ($(BR2_ck610),y)
-GCC_TARGET_CPU := ck610
-else ifeq ($(BR2_ck807),y)
-GCC_TARGET_CPU := ck807
-else ifeq ($(BR2_ck810),y)
-GCC_TARGET_CPU := ck810
-else ifeq ($(BR2_ck860),y)
-GCC_TARGET_CPU := ck860
-endif
-
-ifeq ($(BR2_CSKY_FPU),y)
-GCC_TARGET_CPU := $(GCC_TARGET_CPU)f
-endif
-
-ifeq ($(BR2_CSKY_VDSP),y)
-GCC_TARGET_CPU := $(GCC_TARGET_CPU)v
-endif
-
-endif
--- a/board/acmesystems/aria-g25/genimage.cfg
+++ b/board/acmesystems/aria-g25/genimage.cfg
@@ -11,7 +11,7 @@ image boot.vfat {
 		}

 		file boot.bin {
-			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin"
+			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.6.bin"
 		}
 	}
 	size = 16M
--- a/board/acmesystems/aria-g25/post-image.sh
+++ b/board/acmesystems/aria-g25/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage  \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/acmesystems/arietta-g25/genimage.cfg
+++ b/board/acmesystems/arietta-g25/genimage.cfg
@@ -11,7 +11,7 @@ image boot.vfat {
 		}
 		
 		file boot.bin {
-			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin"
+			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.6.bin"
 		} 
 	}
 	size = 16M
--- a/board/acmesystems/arietta-g25/post-image.sh
+++ b/board/acmesystems/arietta-g25/post-image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage  \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
--- a/board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config
+++ b/board/arcturus/ppc-ucp1020/configs/linux-4.1.x.config
@@ -0,0 +1,269 @@
+CONFIG_PPC_85xx=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_CROSS_COMPILE="powerpc-linux-"
+CONFIG_LOCALVERSION="-ANI-uCP1020-64EE512"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="uCP1020-64EE512"
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_UCP1020_SOM=y
+CONFIG_HIGHMEM=y
+CONFIG_PREEMPT=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_MATH_EMULATION=y
+CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
+CONFIG_SWIOTLB=y
+# CONFIG_COMPACTION is not set
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+# CONFIG_PCIEAER is not set
+# CONFIG_PCIEASPM is not set
+CONFIG_PCI_MSI=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_SYN_COOKIES=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_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_BRIDGE=y
+CONFIG_VLAN_8021Q=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_CFG80211=y
+# CONFIG_CFG80211_DEFAULT_PS is not set
+CONFIG_MAC80211=y
+# CONFIG_MAC80211_RC_MINSTREL is not set
+CONFIG_UEVENT_HELPER_PATH="/bin/hotplug"
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_FTL=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_MTD_NAND_FSL_UPM=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=131072
+CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+CONFIG_GIANFAR=y
+# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_MICREL_PHY=y
+CONFIG_IWLWIFI=m
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_SERIO_LIBPS2=y
+CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_NOZOMI=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_NVRAM=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MPC=y
+CONFIG_SPI=y
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_FSL_ESPI=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_MPC8XXX=y
+CONFIG_SENSORS_LM90=y
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_BOOKE_WDT=y
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=36
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=y
+CONFIG_USB_GSPCA=y
+CONFIG_USB_PWC=y
+CONFIG_USB_ZR364XX=y
+CONFIG_USB_STKWEBCAM=y
+CONFIG_VIDEO_EM28XX=y
+CONFIG_VIDEO_EM28XX_V4L2=y
+# CONFIG_HID is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_ACM=y
+CONFIG_USB_WDM=y
+CONFIG_USB_TMC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_MDC800=y
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_ESDHC=y
+CONFIG_DMADEVICES=y
+CONFIG_FSL_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_EXT4_FS=y
+CONFIG_XFS_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NTFS_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_WBUF_VERIFY=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_CRAMFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_NFSD=y
+CONFIG_CIFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_FTRACE is not set
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_PPC=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DEV_TALITOS=y
--- a/board/arcturus/ppc-ucp1020/patches/linux/0001-Arcturus-uCP1020-BSP-support.patch
+++ b/board/arcturus/ppc-ucp1020/patches/linux/0001-Arcturus-uCP1020-BSP-support.patch
@@ -0,0 +1,462 @@
+From a243628639e12a4bd0a737eac78a12ed240cd137 Mon Sep 17 00:00:00 2001
+From: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Date: Mon, 18 Jul 2016 10:40:16 -0400
+Subject: [PATCH] Arcturus uCP1020 BSP support
+
+The uCP1020 product family (ucp1020) is an Arcturus Networks Inc.
+System on Modules product featuring a NXP QorIQ P1020 CPU,
+optionally populated with 1 or 2 Gig-Ethernet PHYs,
+DDR3, NOR Flash, eMMC NAND Flash and/or SPI Flash.
+
+Signed-off-by: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Signed-off-by: Michael Durrant <arcsupport@arcturusnetworks.com>
+---
+ arch/powerpc/boot/dts/ucp1020.dts         |  87 ++++++++++++
+ arch/powerpc/boot/dts/ucp1020.dtsi        | 211 ++++++++++++++++++++++++++++++
+ arch/powerpc/platforms/85xx/Kconfig       |   7 +
+ arch/powerpc/platforms/85xx/Makefile      |   1 +
+ arch/powerpc/platforms/85xx/ucp1020_som.c |  92 +++++++++++++
+ 5 files changed, 398 insertions(+)
+ create mode 100644 arch/powerpc/boot/dts/ucp1020.dts
+ create mode 100644 arch/powerpc/boot/dts/ucp1020.dtsi
+ create mode 100644 arch/powerpc/platforms/85xx/ucp1020_som.c
+
+diff --git a/arch/powerpc/boot/dts/ucp1020.dts b/arch/powerpc/boot/dts/ucp1020.dts
+new file mode 100644
+index 0000000..291e70a
+--- /dev/null
+++ b/arch/powerpc/boot/dts/ucp1020.dts
+@@ -0,0 +1,87 @@
+/*
+ * uCP1020 Tree Source (32-bit address map)
+ *
+ * Copyright 2013-2016 Arcturus Networks Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "fsl/p1020si-pre.dtsi"
+/ {
+	model = "arcturus,uCP1020";
+	compatible = "arcturus,uCP1020";
+
+	memory {
+		device_type = "memory";
+	};
+
+	lbc: localbus@ffe05000 {
+		reg = <0 0xffe05000 0 0x1000>;
+
+		/* NOR Flash */
+		ranges = <0x0 0x0 0x0 0xec000000 0x04000000>;
+	};
+
+	soc: soc@ffe00000 {
+		ranges = <0x0 0x0 0xffe00000 0x100000>;
+	};
+
+	pci0: pcie@ffe09000 {
+		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
+			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
+		reg = <0 0xffe09000 0 0x1000>;
+		pcie@0 {
+			ranges = <0x2000000 0x0 0xa0000000
+				  0x2000000 0x0 0xa0000000
+				  0x0 0x20000000
+
+				  0x1000000 0x0 0x0
+				  0x1000000 0x0 0x0
+				  0x0 0x100000>;
+		};
+	};
+
+	pci1: pcie@ffe0a000 {
+		reg = <0 0xffe0a000 0 0x1000>;
+		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
+			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
+		pcie@0 {
+			ranges = <0x2000000 0x0 0x80000000
+				  0x2000000 0x0 0x80000000
+				  0x0 0x20000000
+
+				  0x1000000 0x0 0x0
+				  0x1000000 0x0 0x0
+				  0x0 0x100000>;
+		};
+	};
+};
+
+/include/ "ucp1020.dtsi"
+/include/ "fsl/p1020si-post.dtsi"
+diff --git a/arch/powerpc/boot/dts/ucp1020.dtsi b/arch/powerpc/boot/dts/ucp1020.dtsi
+new file mode 100644
+index 0000000..7cff949
+--- /dev/null
+++ b/arch/powerpc/boot/dts/ucp1020.dtsi
+@@ -0,0 +1,211 @@
+/*
+ * uCP1020 Device Tree Source stub (no addresses or top-level ranges)
+ *
+ * Copyright 2013-2016 Arcturus Networks Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+&lbc {
+	nor@0,0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "cfi-flash";
+		reg = <0x0 0x0 0x04000000>;
+		bank-width = <2>;
+		device-width = <1>;
+
+		partition@100000 {
+			/* 7MB - PART 0 */
+			reg = <0x00100000 0x00700000>;
+			label = "0";
+		};
+
+		partition@800000 {
+			/* 32MB - PART 1 */
+			reg = <0x0800000 0x02000000>;
+			label = "1";
+		};
+
+		partition@2800000 {
+			/* 8MB - PART 2 */
+			reg = <0x02800000 0x00800000>;
+			label = "2";
+		};
+
+		partition@3000000 {
+			/* (16MB - 512K) - PART 3 JFFS 2 */
+			reg = <0x03000000 0x00f80000>;
+			label = "3";
+		};
+
+		partition@0 {
+			/* 512KB - bootloader[u-boot, uCbootloader] */
+			reg = <0x0 0x00080000>;
+			label = "BOOT_SPI";
+		};
+
+		partition@3f80000 {
+			/* 512KB - bootloade NOR r[u-boot, uCbootloader] */
+			reg = <0x03f80000 0x00080000>;
+			label = "B";
+		};
+
+		partition@80000 {
+			/* 256KB - bootloaders environment (uCenv) */
+			reg = <0x00080000 0x00040000>;
+	
+			label = "E";
+		};
+
+		partition@C0000 {
+			/* 256KB - bootloaders environment (u-boot) */
+			reg = <0x000C0000 0x00040000>;
+			label = "UENV";
+		};
+	};
+};
+
+&soc {
+	i2c@3000 {
+		spoc@14 {
+			compatible = "conexant,cx2070x";
+			reg = <0x14>;
+		};
+	};
+
+	i2c@3100 {
+			dtt@4C {
+				compatible = "national,lm90";
+				reg = <0x4C>;
+			};
+	};
+
+	spi@7000 {
+		flash@0 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "winbond,w25q80bl";
+			reg = <0>;
+			spi-max-frequency = <40000000>; /* input clock */
+
+			partition@0 {
+				label = "SPI MBR";
+				reg = <0x00000000 0x00002000>;
+				read-only;
+			};
+			partition@2000 {
+				label = "SPI ENV";
+				reg = <0x00002000 0x00006000>;
+				read-only;
+			};
+			partition@8000 {
+				label = "SPI FS";
+				reg = <0x00008000 0x000F8000>;
+			};
+		};
+		flash@3 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "spansion,s25fl008k";
+			reg = <3>;
+			spi-max-frequency = <40000000>; /* input clock */
+			partition@0 {
+				label = "SPI USER";
+				reg = <0x00000000 0x00100000>;
+			};
+		};
+	};
+
+	usb@22000 {
+		phy_type = "ulpi";
+		dr_mode = "host";
+	};
+
+	mdio@24000 {
+		phy0: ethernet-phy@4 {
+			interrupt-parent = <&mpic>;
+			interrupts = <4 1>;
+			reg = <0x04>;
+		};
+
+		phy1: ethernet-phy@6 {
+			interrupt-parent = <&mpic>;
+			interrupts = <8 1>;
+			reg = <0x6>;
+		};
+	};
+
+	enet0: ethernet@b0000 {
+		phy-handle = <&phy0>;
+		phy-connection-type = "rgmii-id";
+	};
+
+	enet1: ethernet@b1000 {
+		status = "disabled";
+	};
+
+	enet2: ethernet@b2000 {
+		phy-handle = <&phy1>;
+		phy-connection-type = "rgmii-id";
+	};
+
+	gpio0: gpio@f000 {
+		compatible = "fsl,mpc8572-gpio", "fsl,pq3-gpio";
+		reg = <0xf000 0x1000>;
+		interrupts = <47 2>;
+		interrupt-parent = <&mpic>;
+		#gpio-cells = <2>;
+		gpio-controller;
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+		gpio5 {
+			label = "led1";		/* LED15 */
+			gpios = <&gpio0 5 0>;
+		};
+		gpio12 {
+			label = "led2";		/* LED16 */
+			gpios = <&gpio0 12 0>;
+		};
+		gpio13 {
+			label = "led3";		/* LED17 */
+			gpios = <&gpio0 13 0>;
+		};
+		gpio7 {
+			label = "led4";		/* LED18 */
+			gpios = <&gpio0 7 0>;
+		};
+		gpio6 {
+			label = "led5";		/* LED19 */
+			gpios = <&gpio0 6 0>;
+		};
+	};
+};
+diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
+index 2fb4b24..81a944f 100644
+--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
+@@ -241,6 +241,13 @@ config SGY_CTS1000
+ 	help
+ 	  Enable this to support functionality in Servergy's CTS-1000 systems.
+ 
+config UCP1020_SOM
+	bool "Arcturus uCP1020 Rev.1.3 System on Module"
+	select DEFAULT_UIMAGE
+	help
+	  This option enables support for the Arcturus Networks Inc. 
+	  uCP1020 System on Module.
+
+ config MVME2500
+ 	bool "Artesyn MVME2500"
+ 	select DEFAULT_UIMAGE
+diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
+index 1fe7fb9..84f2b9a 100644
+--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
+@@ -31,4 +31,5 @@ obj-$(CONFIG_XES_MPC85xx) += xes_mpc85xx.o
+ obj-$(CONFIG_GE_IMP3A)	  += ge_imp3a.o
+ obj-$(CONFIG_PPC_QEMU_E500) += qemu_e500.o
+ obj-$(CONFIG_SGY_CTS1000) += sgy_cts1000.o
+obj-$(CONFIG_UCP1020_SOM) += ucp1020_som.o
+ obj-$(CONFIG_MVME2500)	  += mvme2500.o
+diff --git a/arch/powerpc/platforms/85xx/ucp1020_som.c b/arch/powerpc/platforms/85xx/ucp1020_som.c
+new file mode 100644
+index 0000000..777e8ad
+--- /dev/null
+++ b/arch/powerpc/platforms/85xx/ucp1020_som.c
+@@ -0,0 +1,92 @@
+/*
+ * Arcturus Networks Inc. uCP1020 module Setup
+ *
+ * Copyright 2014-2016 Arcturus Networks Inc.
+ *
+ * by Oleksandr G Zhadan & Michael Durrant (www.ArcturusNetworks.com)
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/interrupt.h>
+#include <linux/of_platform.h>
+
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+#include <asm/fsl_guts.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+#include "smp.h"
+
+#include "mpc85xx.h"
+
+void __init ucp1020_som_pic_init(void)
+{
+	struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
+	  MPIC_SINGLE_DEST_CPU,
+	  0, 256, " OpenPIC  ");
+
+	BUG_ON(mpic == NULL);
+
+	mpic_init(mpic);
+}
+
+/*
+ * Setup the architecture
+ */
+static void __init ucp1020_som_setup_arch(void)
+{
+	if (ppc_md.progress)
+		ppc_md.progress("uCP1020_SoM_setup_arch()", 0);
+
+	mpc85xx_smp_init();
+
+	fsl_pci_assign_primary();
+	pr_info("\n\t%s (http://www.arcturusnetworks.com)\n", ppc_md.name);
+}
+
+machine_arch_initcall(ucp1020, mpc85xx_common_publish_devices);
+machine_arch_initcall(ucp1020, swiotlb_setup_bus_notifier);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init ucp1020_probe(void)
+{
+	unsigned long root = of_get_flat_dt_root();
+
+	if (of_flat_dt_is_compatible(root, "arcturus,uCP1020"))
+		return 1;
+	return 0;
+}
+
+define_machine(ucp1020) {
+	.name			= "uCP1020 SoM - Arcturus Networks Inc.",
+	.probe			= ucp1020_probe,
+	.setup_arch		= ucp1020_som_setup_arch,
+	.init_IRQ		= ucp1020_som_pic_init,
+#ifdef CONFIG_PCI
+	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
+#endif
+	.get_irq		= mpic_get_irq,
+	.restart		= fsl_rstcr_restart,
+	.calibrate_decr		= generic_calibrate_decr,
+#ifdef DEBUG 
+	.progress		= udbg_progress,
+#endif
+};
+-- 
+2.1.4
+
--- a/board/arcturus/ppc-ucp1020/patches/linux/0002-p1020-esdhc-controller-reserved-bit.patch
+++ b/board/arcturus/ppc-ucp1020/patches/linux/0002-p1020-esdhc-controller-reserved-bit.patch
@@ -0,0 +1,28 @@
+From 4c74fd1266287deca0c1ff091071c5b8558b9735 Mon Sep 17 00:00:00 2001
+From: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Date: Mon, 18 Jul 2016 10:45:41 -0400
+Subject: [PATCH 1/1] p1020 esdhc controller reserved bit
+
+Prevent SDHCI core from writing reserved bits, where
+p1020 reserved bit is SDHCI_CTRL_HISPD, not 0x01(SDHCI_CTRL_LED).
+
+Signed-off-by: Oleksandr G Zhadan <oleks@arcturusnetworks.com>
+Signed-off-by: Michael Durrant <arcsupport@arcturusnetworks.com>
+---
+ drivers/mmc/host/sdhci-esdhc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h
+index a870c42..b45de0a 100644
+--- a/drivers/mmc/host/sdhci-esdhc.h
+++ b/drivers/mmc/host/sdhci-esdhc.h
+@@ -45,6 +45,6 @@
+ #define ESDHC_DMA_SYSCTL	0x40c
+ #define ESDHC_DMA_SNOOP		0x00000040
+ 
+-#define ESDHC_HOST_CONTROL_RES	0x01
+#define ESDHC_HOST_CONTROL_RES	(SDHCI_CTRL_HISPD)
+ 
+ #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */
+-- 
+2.1.4
--- 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
@@ -0,0 +1,53 @@
+From 35b7ce4f8f290794d3b89db7461e8c568b5defa1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Apr 2016 09:19:17 -0700
+Subject: powerpc/ptrace: Fix out of bounds array access warning
+
+commit 1e407ee3b21f981140491d5b8a36422979ca246f upstream.
+
+gcc-6 correctly warns about a out of bounds access
+
+arch/powerpc/kernel/ptrace.c:407:24: warning: index 32 denotes an offset greater than size of 'u64[32][1] {aka long long unsigned int[32][1]}' [-Warray-bounds]
+        offsetof(struct thread_fp_state, fpr[32][0]));
+                        ^
+
+check the end of array instead of beginning of next element to fix this
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Cc: Segher Boessenkool <segher@kernel.crashing.org>
+Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+Acked-by: Olof Johansson <olof@lixom.net>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Oleksandr Zhadan <oleks@arcturusnetworks.com>
+---
+ arch/powerpc/kernel/ptrace.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
+index f21897b..93f200f 100644
+--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
+@@ -376,7 +376,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
+ 
+ #else
+ 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
+-		     offsetof(struct thread_fp_state, fpr[32][0]));
+		     offsetof(struct thread_fp_state, fpr[32]));
+ 
+ 	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+ 				   &target->thread.fp_state, 0, -1);
+@@ -404,7 +404,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,
+ 	return 0;
+ #else
+ 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
+-		     offsetof(struct thread_fp_state, fpr[32][0]));
+		     offsetof(struct thread_fp_state, fpr[32]));
+ 
+ 	return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+ 				  &target->thread.fp_state, 0, -1);
+-- 
+cgit v1.1
--- a/board/arcturus/ppc-ucp1020/readme.txt
+++ b/board/arcturus/ppc-ucp1020/readme.txt
@@ -38,7 +38,6 @@ You'll need to program the files created by buildroot into the NOR flash.
    B$ protect off 0xeff80000 +$filesize
    B$ erase 0xeff80000 +$filesize
    B$ cp.b $loadaddr 0xeff80000 $filesize
-    B$ protect on 0xeff80000 +$filesize

 2. Program the kernel

--- a/board/atmel/sama5d2_xplained_mmc/genimage.cfg
+++ b/board/atmel/sama5d2_xplained_mmc/genimage.cfg
@@ -5,6 +5,9 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d2_xplained.dtb",
+			"at91-sama5d2_xplained_pda4.dtb",
+			"at91-sama5d2_xplained_pda7.dtb",
+			"at91-sama5d2_xplained_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}
--- a/board/atmel/sama5d3_xplained_mmc/genimage.cfg
+++ b/board/atmel/sama5d3_xplained_mmc/genimage.cfg
@@ -5,6 +5,9 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d3_xplained.dtb",
+			"at91-sama5d3_xplained_pda4.dtb",
+			"at91-sama5d3_xplained_pda7.dtb",
+			"at91-sama5d3_xplained_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}
--- a/board/atmel/sama5d4_xplained_mmc/genimage.cfg
+++ b/board/atmel/sama5d4_xplained_mmc/genimage.cfg
@@ -5,6 +5,10 @@ image boot.vfat {
 		files = {
 			"zImage",
 			"at91-sama5d4_xplained.dtb",
+			"at91-sama5d4_xplained_hdmi.dtb",
+			"at91-sama5d4_xplained_pda4.dtb",
+			"at91-sama5d4_xplained_pda7.dtb",
+			"at91-sama5d4_xplained_pda7b.dtb",
 			"boot.bin",
 			"u-boot.bin"
 		}
--- a/board/beagleboardx15/post-image.sh
+++ b/board/beagleboardx15/post-image.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+    --rootpath "${TARGET_DIR}" \
+    --tmppath "${GENIMAGE_TMP}" \
+    --inputpath "${BINARIES_DIR}" \
+    --outputpath "${BINARIES_DIR}" \
+    --config "${GENIMAGE_CFG}"
--- a/board/beaglebone/post-build.sh
+++ b/board/beaglebone/post-build.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-
-cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt
--- a/board/beaglebone/uEnv.txt
+++ b/board/beaglebone/uEnv.txt
@@ -3,9 +3,6 @@ devtype=mmc
 bootdir=
 bootfile=zImage
 bootpartition=mmcblk0p2
-console=ttyS0,115200n8
-loadaddr=0x82000000
-fdtaddr=0x88000000
 set_mmc1=if test $board_name = A33515BB; then setenv bootpartition mmcblk1p2; fi
-set_bootargs=setenv bootargs console=${console} root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
+set_bootargs=setenv bootargs console=ttyO0,115200n8 root=/dev/${bootpartition} rw rootfstype=ext4 rootwait
 uenvcmd=run set_mmc1; run set_bootargs;run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr}
--- a/board/beagleboneai/genimage.cfg
+++ b/board/beagleboneai/genimage.cfg
@@ -1,29 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"MLO",
-			"u-boot.img",
-			"zImage",
-			"am5729-beagleboneai.dtb",
-			"uEnv.txt"
-		}
-	}
-	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/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch
+++ b/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch
--- a/board/beagleboneai/post-build.sh
+++ b/board/beagleboneai/post-build.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-
-cp board/beagleboneai/uEnv.txt $BINARIES_DIR/uEnv.txt
--- a/board/beagleboneai/readme.txt
+++ b/board/beagleboneai/readme.txt
@@ -1,28 +0,0 @@
-Intro
-=====
-
-This configuration will build a basic image for the BeagleBoard.org
-BeagleBone AI. For more details about the board, visit:
-
-https://beagleboard.org/ai
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make beagleboneai_defconfig
-
-Compile everything and build the USB flash drive 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/beagleboneai/uEnv.txt
+++ b/board/beagleboneai/uEnv.txt
@@ -1,6 +0,0 @@
-bootpart=0:1
-bootdir=/
-bootargs=console=ttyS0,115200n8 root=/dev/mmcblk0p2 ro rootwait
-devtype=mmc
-fdtfile=am5729-beagleboneai.dtb
-uenvcmd=run loadimage; run loadfdt; printenv bootargs; bootz ${loadaddr} - ${fdtaddr}
--- a/board/ci20/genimage.cfg
+++ b/board/ci20/genimage.cfg
@@ -24,5 +24,6 @@ image sdcard.img {
        partition-type = 0x83
        image = "rootfs.ext4"
        offset = 2M
+        size = 60M
    }
 }
--- a/board/csky/gx6605s/gx6605s.dts
+++ b/board/csky/gx6605s/gx6605s.dts
@@ -1,155 +0,0 @@
-/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "C-SKY gx6605s";
-	compatible = "csky,gx6605s";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	memory {
-		device_type = "memory";
-		reg = <0x10000000 0x04000000>;
-	};
-
-	soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "simple-bus";
-		ranges;
-
-		dummy_apb: apb-clock {
-			compatible = "fixed-clock";
-			clock-frequency = <27000000>;
-			clock-output-names = "dummy_apb";
-			#clock-cells = <0>;
-		};
-
-		intc: interrupt-controller@500000 {
-			compatible = "csky,gx6605s-intc";
-			reg = <0x00500000 0x400>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		timer@20a000 {
-			compatible = "csky,gx6605s-timer";
-			reg = <0x0020a000 0x400>;
-			clocks = <&dummy_apb>;
-			interrupts = <10>;
-			interrupt-parent = <&intc>;
-		};
-
-		ehci-hcd@900000 {
-			compatible = "generic-ehci";
-			reg = <0x00900000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <59>;
-		};
-
-		ohci-hcd0@a00000 {
-			compatible = "generic-ohci";
-			reg = <0x00a00000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <58>;
-		};
-
-		ohci-hcd1@b00000 {
-			compatible = "generic-ohci";
-			reg = <0x00b00000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <57>;
-		};
-
-		serial@403000 {
-			compatible = "ns16550a";
-			reg = <0x00403000 0x400>;
-			interrupt-parent = <&intc>;
-			interrupts = <15>;
-			clock-frequency = <29491200>;
-			baud = <115200>;
-			reg-shift = <2>;
-			reg-io-width = <1>;
-		};
-
-		gpio0: gpio@305000 {
-			compatible = "wd,mbl-gpio";
-			reg-names = "dirout", "dat", "set", "clr";
-			reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>;
-			bgpio-base = <0>;
-			#gpio-cells = <2>;
-			gpio-controller;
-		};
-
-		gpio_buttons {
-			compatible = "gpio-keys-polled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			poll-interval = <100>;
-			autorepeat;
-
-			button0 {
-				label = "button8";
-				linux,code = <KEY_LEFT>;
-				gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
-			};
-
-			button1 {
-				label = "button6";
-				linux,code = <KEY_RIGHT>;
-				gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
-			};
-
-			button2 {
-				label = "button5";
-				linux,code = <KEY_UP>;
-				gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-			};
-
-			button3 {
-				label = "button9";
-				linux,code = <KEY_DOWN>;
-				gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
-			};
-
-			button4 {
-				label = "button7";
-				linux,code = <KEY_ENTER>;
-				gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
-			};
-		};
-
-		gpio_leds {
-			compatible = "gpio-leds";
-
-			led0 {
-				label = "led10";
-				gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "heartbeat";
-			};
-
-			led1 {
-				label = "led11";
-				gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "timer";
-			};
-
-			led2 {
-				label = "led12";
-				gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "default-on";
-			};
-
-			led3 {
-				label = "led13";
-				gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
-				linux,default-trigger = "default-on";
-			};
-		};
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait";
-	};
-};
--- a/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch
+++ b/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch
@@ -0,0 +1,25 @@
+From 7e3f2c482bc16537a093e87a27f0d465804a88e4 Mon Sep 17 00:00:00 2001
+From: Julien Olivain <juju@cotds.org>
+Date: Tue, 11 Dec 2018 23:04:46 +0100
+Subject: [PATCH] csky: update cmdline for serial console and rootfs on sda1
+
+Signed-off-by: Julien Olivain <juju@cotds.org>
+---
+ arch/csky/boot/dts/gx6605s.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/csky/boot/dts/gx6605s.dts b/arch/csky/boot/dts/gx6605s.dts
+index ce56106af967..f5d60b21e6f9 100644
+--- a/arch/csky/boot/dts/gx6605s.dts
+++ b/arch/csky/boot/dts/gx6605s.dts
+@@ -155,6 +155,6 @@
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=tty0 init=/sbin/init root=/dev/sda2 rw rootwait";
+		bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda1 rw rootwait";
+ 	};
+ };
+-- 
+2.19.2
+
--- a/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
+++ b/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl
@@ -1,30 +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,
-# * SPL is at the offset expected by ROM,
-# * U-Boot is at the offset expected by SPL,
-# * The first partition is expected to be an ext2 and have a /boot directory.
-#
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition spl {
-    in-partition-table = "no"
-    image = "SPL"
-    offset = 1024
-  }
-
-  partition u-boot {
-    in-partition-table = "no"
-    image = "%UBOOTBIN%"
-    offset = 69K
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-  }
-}
--- a/board/freescale/common/imx/genimage.cfg.template_spl
+++ b/board/freescale/common/imx/genimage.cfg.template_spl
@@ -26,9 +26,9 @@ image sdcard.img {
    offset = 1024
  }

-  partition u-boot {
+  partition u-boot-img {
    in-partition-table = "no"
-    image = "%UBOOTBIN%"
+    image = "u-boot.img"
    offset = 69K
  }

--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -10,18 +10,11 @@ main ()

 	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
+		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
 		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
 		rm -f ${BINARIES_DIR}/u-boot.its

 		${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
-		rm -f ${BINARIES_DIR}/u-boot.its
-
-		${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 	else
 		${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit
 		cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin
--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -34,14 +34,8 @@ genimage_type()
 {
 	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		echo "genimage.cfg.template_imx8"
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
-		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
-		    echo "genimage.cfg.template_no_boot_part_spl"
-		fi
 	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"
 	else
@@ -53,8 +47,6 @@ imx_offset()
 {
 	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
 		echo "33K"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		echo "33K"
 	else
 		echo "32K"
 	fi
@@ -66,10 +58,6 @@ uboot_image()
 		echo "u-boot-dtb.imx"
 	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then
 		echo "u-boot.imx"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then
-	    echo "u-boot-dtb.img"
-	elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then
-	    echo "u-boot.img"
 	fi
 }

--- a/board/freescale/imx6-sabresd/readme.txt
+++ b/board/freescale/imx6-sabresd/readme.txt
@@ -80,7 +80,6 @@ Running kmscube application:
 Running Qt5 Cinematic Demo:

 # export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
-# export QT_QPA_EGLFS_ALWAYS_SET_MODE=1
 # /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience

 Running gl2mark benchmark:
--- a/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
+++ b/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
@@ -4,11 +4,11 @@
  "pbuffers": true,
  "outputs": [
    {
-      "name": "HDMI1",
+      "name": "HDMI-1",
      "mode": "off"
    },
    {
-      "name": "LVDS1",
+      "name": "LVDS-1",
      "mode": "1024x768"
    }
  ]
--- a/board/freescale/imx8mmevk/readme.txt
+++ b/board/freescale/imx8mmevk/readme.txt
@@ -1,71 +0,0 @@
-***************************
-Freescale i.MX8MM EVK board
-***************************
-
-This file documents the Buildroot support for the Freescale i.MX8MM
-EVK board.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX8MM EVK board:
-
-  make freescale_imx8mmevk_defconfig
-
-Build all components:
-
-  make
-
-You will find in output/images/ the following files:
-  - bl31.bin
-  - boot.vfat
-  - fsl-imx8mm-evk.dtb
-  - Image
-  - imx8-boot-sd.bin
-  - lpddr4_pmu_train_fw.bin
-  - rootfs.ext2
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.bin
-  - u-boot.imx
-  - u-boot-nodtb.bin
-  - u-boot-spl-ddr.bin
-
-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_imx8.
-
-Boot the i.MX8MM EVK board
-==========================
-
-To boot your newly created system (refer to the i.MX8MMini EVK Quick Start Guide
-[1] for guidance):
- insert the SD card in the SD slot of the board;
- Configure the switches as follows:
-SW1101:	0110110010 [D1-D10]
-SW1102:	0001101000 [D1-D10]
- 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!
-
-References
-==========
-[1] https://www.nxp.com/document/guide/Get-Started-with-the-i.MX-8M-Mini-EVK:GS-iMX-8M-Mini-EVK
--- a/board/friendlyarm/nanopi-neo-plus2/boot.cmd
+++ b/board/friendlyarm/nanopi-neo-plus2/boot.cmd
@@ -1,6 +0,0 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
-
-fatload mmc 0 $kernel_addr_r Image
-fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo-plus2.dtb
-
-booti $kernel_addr_r - $fdt_addr_r
--- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
@@ -1,39 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h5-nanopi-neo-plus2.dtb",
-			"boot.scr"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8192
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
+++ b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
@@ -1,10 +0,0 @@
-# wireless core
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_CFG80211_WEXT=y
-
-# wireless drivers
-CONFIG_WLAN=y
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_BRCMFMAC=m
--- a/board/friendlyarm/nanopi-neo-plus2/readme.txt
+++ b/board/friendlyarm/nanopi-neo-plus2/readme.txt
@@ -1,37 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Nanopi NEO Plus2. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Nanopi NEO2 link:
-http://nanopi.io/nanopi-neo-plus2.html
-
-Wiki link:
-http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Plus2
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make friendlyarm_nanopi_neo_plus2_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Nanopi NEO Plus2 and power it up. The console
-is on the serial line, 115200 8N1.
--- a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt
+++ b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt
@@ -1,53 +0,0 @@
-#AP6212_NVRAM_V1.0.1_20160606
-# 2.4 GHz, 20 MHz BW mode
-# The following parameter values are just placeholders, need to be updated.
-manfid=0x2d0
-prodid=0x0726
-vendid=0x14e4
-devid=0x43e2
-boardtype=0x0726
-boardrev=0x1101
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-sromrev=11
-boardflags=0x00404201
-xtalfreq=26000
-nocrc=1
-ag0=255
-aa2g=1
-ccode=ALL
-
-pa0itssit=0x20
-extpagain2g=0
-
-#PA parameters for 2.4GHz, measured at CHIP OUTPUT
-pa2ga0=-168,7161,-820
-AvVmid_c0=0x0,0xc8
-cckpwroffset0=5
-
-# PPR params
-maxp2ga0=90
-txpwrbckof=6
-cckbw202gpo=0x5555
-legofdmbw202gpo=0x77777777
-mcsbw202gpo=0xaaaaaaaa
-
-# OFDM IIR :
-ofdmdigfilttype=7
-# PAPD mode:
-papdmode=2
-
-il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-
-#OOB parameters
-hostwake=0x40
-hostrdy=0x41
-usbrdy=0x03
-usbrdydelay=100
-deadman_to=0xffffffff
-# muxenab: 0x1 for UART enable, 0x10 for Host awake
-muxenab=0x10
-# CLDO PWM voltage settings - 0x4 - 1.1 volt
-#cldo_pwm=0x4
-glitch_based_crsmin=1
--- a/board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch
+++ b/board/lemaker/bananapro/patches/linux/0001-arch-arm-boot-dts-sun7i-a20-bananapro.dts-disable-00.patch
@@ -1,44 +0,0 @@
-From 896e82ab14e7e4e361ffa7c81def787907c1bf4c Mon Sep 17 00:00:00 2001
-From: Bartosz Bilas <b.bilas@grinn-global.com>
-Date: Sun, 19 May 2019 21:04:35 +0200
-Subject: [PATCH] arch/arm/boot/dts/sun7i-a20-bananapro.dts: disable 00B
- IRQ for brcm wifi module
-
-	BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
---
- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
-index 0176e9de0..93b3340f5 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
-+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
-@@ -160,9 +160,19 @@
- 	brcmf: wifi@1 {
- 		reg = <1>;
- 		compatible = "brcm,bcm4329-fmac";
-		interrupt-parent = <&pio>;
-		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
-		interrupt-names = "host-wake";
-+		/*
-+		 * OOB interrupt support is broken ATM, often the first irq
-+		 * does not get seen resulting in the drv probe failing with:
-+		 *
-+		 * brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout
-+		 * brcmfmac: brcmf_bus_started: failed: -110
-+		 * brcmfmac: brcmf_attach: dongle is not responding: err=-110
-+		 * brcmfmac: brcmf_sdio_firmware_callback: brcmf_attach failed
-+		 *
-+		 * interrupt-parent = <&pio>;
-+		 * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
-+		 * interrupt-names = "host-wake";
-+		 */
- 	};
- };
- 
-- 
-2.21.0
-
--- a/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+++ b/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
@@ -1 +0,0 @@
-brcmfmac43362-sdio.txt
--- a/board/librecomputer/lafrite/genimage.cfg
+++ b/board/librecomputer/lafrite/genimage.cfg
@@ -1,10 +0,0 @@
-image usb.img {
-	hdimage {
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/librecomputer/lafrite/overlay/extlinux/extlinux.conf
+++ b/board/librecomputer/lafrite/overlay/extlinux/extlinux.conf
@@ -1,4 +0,0 @@
-label linux
-  kernel /boot/Image
-  devicetree /boot/meson-gxl-s805x-libretech-ac.dtb
-  append console=ttyAML0,115200 earlyprintk root=/dev/sda1 rootwait
--- a/board/librecomputer/lafrite/readme.txt
+++ b/board/librecomputer/lafrite/readme.txt
@@ -1,34 +0,0 @@
-Intro
-=====
-
-Libre Computer "La Frite" is a low cost SBC based around an Amlogic
-s805x SoC (quad A53), 512MB/1GB DDR4 and a 16MB SPI NOR flash:
-
-https://libre.computer/products/boards/aml-s805x-ac/
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make lafrite_defconfig
-
-Compile everything and build the USB flash drive image:
-
-    $ make
-
-How to write the USB flash drive image
-======================================
-
-Once the build process is finished you will have an image called "usb.img"
-in the output/images/ directory.
-
-Copy the bootable "usb.img" onto a USB flash drive with "dd":
-
-  $ sudo dd if=output/images/usb.img of=/dev/sdX
-
-How to boot
-===========
-
-Insert flash drive to the USB connector furthest away from the IR
-receiver and power up board. The system will boot automatically.
--- a/board/minnowboard/post-image.sh
+++ b/board/minnowboard/post-image.sh
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+GENIMAGE_CFG="board/minnowboard/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+    --rootpath "${TARGET_DIR}" \
+    --tmppath "${GENIMAGE_TMP}" \
+    --inputpath "${BINARIES_DIR}" \
+    --outputpath "${BINARIES_DIR}" \
+    --config "${GENIMAGE_CFG}"
--- a/board/olimex/a33_olinuxino/boot.cmd
+++ b/board/olimex/a33_olinuxino/boot.cmd
@@ -1,5 +0,0 @@
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
-ext4load mmc 0 0x49000000 /boot/${fdtfile}
-ext4load mmc 0 0x46000000 /boot/zImage
-env set fdt_high ffffffff
-bootz 0x46000000 - 0x49000000
--- a/board/olimex/a33_olinuxino/genimage.cfg
+++ b/board/olimex/a33_olinuxino/genimage.cfg
@@ -1,17 +0,0 @@
-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 rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
--- a/board/olimex/a33_olinuxino/post-build.sh
+++ b/board/olimex/a33_olinuxino/post-build.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
--- a/board/olimex/a33_olinuxino/readme.txt
+++ b/board/olimex/a33_olinuxino/readme.txt
@@ -1,50 +0,0 @@
-A33-OLinuXino
-
-Intro
-=====
-
-This board is based on Allwinner A33 SoC.
-
-Home Page: https://www.olimex.com/Products/OLinuXino/A33/A33-OLinuXino/open-source-hardware
-Wiki: 	   https://wiki.amarulasolutions.com/bsp/sunxi/a33/Olimex-A33-Olinuxino.html
-
-How to build it
-===============
-
-Configure Buildroot:
-
-    $ make olimex_a33_olinuxino_defconfig
-
-Build everything by running:
-
-    $ make
-
-Result of the build
-------------------
-
-After building, you should get a tree like this:
-
-output/images/
-├── boot.scr
-├── rootfs.ext2
-├── rootfs.ext4 -> rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-├── sun8i-a33-olinuxino.dtb
-├── u-boot.bin
-├── u-boot-sunxi-with-spl.bin
-└── zImage
-
-
-How to write the SD card
-========================
-
-The sdcard.img file is a complete bootable image ready to be written
-on the boot medium. To install it, simply copy the image to a uSD
-card:
-
-    # dd if=output/images/sdcard.img of=/dev/sdX
-
-Where 'sdX' is the device node of the uSD.
-
-Eject the SD card, insert it in the A33-OLinuXino board, and power it up.
--- a/board/pandaboard/post-image.sh
+++ b/board/pandaboard/post-image.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage                           \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
+
+exit $?
--- a/board/qemu/arm-vexpress-tz/linux.fragment
+++ b/board/qemu/arm-vexpress-tz/linux.fragment
@@ -1,3 +0,0 @@
-### Enable OP-TEE
-CONFIG_TEE=y
-CONFIG_OPTEE=y
--- a/board/qemu/arm-vexpress-tz/post-build.sh
+++ b/board/qemu/arm-vexpress-tz/post-build.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-
-# Rename boot images for the dear TF-A
-ln -sf u-boot.bin ${BINARIES_DIR}/bl33.bin
-ln -sf tee-header_v2.bin ${BINARIES_DIR}/bl32.bin
-ln -sf tee-pager_v2.bin ${BINARIES_DIR}/bl32_extra1.bin
-ln -sf tee-pageable_v2.bin ${BINARIES_DIR}/bl32_extra2.bin
--- a/board/qemu/arm-vexpress-tz/readme.txt
+++ b/board/qemu/arm-vexpress-tz/readme.txt
@@ -1,138 +0,0 @@
-Board qemu_arm_vexpress_tz builds a QEMU ARMv7-A target system with
-OP-TEE running in the TrustZone secure world and a Linux based
-OS running in the non-secure world. The board configuration enables
-builds of the QEMU host ARM target emulator.
-
-  make qemu_arm_vexpress_tz_defconfig
-  make
-
-The BIOS used in the QEMU host is the ARM Trusted Firmware-A (TF-A). TF-A
-uses QEMU semihosting file access to access boot image files. The
-QEMU platform is quite specific for that in TF-A and one needs to
-run the emulation from the image directory for TF-A to boot the
-secure and non-secure worlds.
-
-  cd output/images && ../host/bin/qemu-system-arm \
-	-machine virt -machine secure=on -cpu cortex-a15 \
-	-smp 1 -s -m 1024 -d unimp \
-	-serial stdio \
-	-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \
-	-semihosting-config enable,target=native \
-	-bios bl1.bin
-
-The boot stage traces (if any) followed by the login prompt will appear
-in the terminal that started QEMU.
-
-If you want to emulate more cores, use "-smp {1|2|3|4}" to select the
-number of cores.
-
-Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic"
-brings network support that is used i.e. in OP-TEE regression tests.
-
-Tested with QEMU 2.12.0, and 3.1.0.
-
-
-- Boot Details --
-
-TF-A is used as QEMU BIOS. Its BL1 image boots and load its BL2 image. In turn,
-this image loads the OP-TEE secure world (ARMv7-A BL32 stage) and the U-boot as
-non-secure bootloader (BL33 stage).
-
-QEMU natively hosts and loads in RAM the QEMU ARM target device tree. OP-TEE
-reads and modifies its content according to OP-TEE configuration.
-
-Enable TF-A traces from LOG_LEVEL (I.e LOG_LEVEL=40) from
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES.
-
-
-- OP-TEE Traces --
-
-Secure boot stages and/or secure runtime services may use a serial link for
-their traces.
-
-The ARM Trusted Firmware outputs its traces on the QEMU standard (first)
-serial interface.
-
-The OP-TEE OS uses the QEMU second serial interface.
-
-To get the OP-TEE OS traces, append a second -serial argument after
-serial stdio in the QEMU command line. I.e, the following enables 2 serial
-consoles over telnet connections:
-
-  cd output/images && ../host/bin/qemu-system-arm \
-	-machine virt -machine secure=on -cpu cortex-a15 \
-	-smp 1 -s -m 1024 -d unimp \
-	-serial telnet:127.0.0.1:1235,server \
-	-serial telnet:127.0.0.1:1236,server \
-	-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \
-	-semihosting-config enable,target=native \
-	-bios bl1.bin
-
-QEMU is now waiting for the telnet connection. From another shell, open a
-telnet connection on the port for the U-boot and Linux consoles:
-
-  telnet 127.0.0.1 1235
-
-and again for the secure console
-
-  telnet 127.0.0.1 1236
-
-
-- Using gdb --
-
-One can debug the OP-TEE secure world using GDB through the QEMU host.
-To do so, simply run the qemu-system-arm emulation, then run a GDB client
-and connect the QEMU internal GDB server.
-
-The example below assumes we run QEMU and the GDB client from the same
-host computer. We use option -S of qemu-system-arm to make QEMU
-waiting for the GDB continue instruction before booting the images.
-
-From a first shell:
-  cd output/images && ../host/bin/qemu-system-arm \
-	-machine virt -machine secure=on -cpu cortex-a15 \
-	-smp 1 -s -m 1024 -d unimp \
-	-serial stdio \
-	-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \
-	-semihosting-config enable,target=native \
-	-bios bl1.bin \
-	-S
-
-From a second shell:
-  ./output/host/bin/arm-linux-gdb
-  GNU gdb (GNU Toolchain for the A-profile Architecture 8.2-2018-08 (arm-rel-8.23)) 8.1.1.20180704-git
-  Copyright (C) 2018 Free Software Foundation, Inc.
-  ...
-  For help, type "help".
-  Type "apropos word" to search for commands related to "word".
-  (gdb)
-
-From this GDB console, connect to the target, load the OP-TEE core symbols,
-set a breakpoint to its entry point (__text_start) and start emulation:
-
-  (gdb) target remote 127.0.0.1:1234
-  (gdb) symbol-file ./output/build/optee-os-<reference>/out/arm/core/tee.elf
-  (gdb) hbreak __text_start
-  Hardware assisted breakpoint 1 at 0xe100000: file core/arch/arm/kernel/generic_entry_a32.S, line 246.
-  (gdb) cont
-  Continuing.
-
-  Thread 1 hit Breakpoint 1, _start () at core/arch/arm/kernel/generic_entry_a32.S:246
-  246		bootargs_entry
-  (gdb)
-
-
-Emulation has started, TF-A has loaded OP-TEE and U-boot images in memory and
-has booted OP-TEE. Emulation stopped at OP-TEE core entry.
-
-Note: QEMU hosts a GDB service listening to TCP port 1234, as set through
-qemu-system-arm command line option -s.
-
-Note: To build the GDB server, the following extra options have to be added to
-the Buildroot configuration:
-
-    BR2_ENABLE_DEBUG=y
-    BR2_PACKAGE_GDB=y
-    BR2_PACKAGE_HOST_GDB=y
-    BR2_TOOLCHAIN_BUILDROOT_CXX=y
-    BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
--- a/board/qemu/arm-vexpress-tz/u-boot.config
+++ b/board/qemu/arm-vexpress-tz/u-boot.config
@@ -1,7 +0,0 @@
-CONFIG_SYS_TEXT_BASE=0x60000000
-CONFIG_BOOTCOMMAND="fdt addr ${fdt_addr} && fdt resize 1000 && smhload zImage ${kernel_addr_r} && smhload rootfs.cpio.gz ${ramdisk_addr_r} ramdisk_addr_end &&  setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && fdt chosen ${ramdisk_addr_r} ${ramdisk_addr_end} && bootz ${kernel_addr_r} - ${fdt_addr}"
-CONFIG_SEMIHOSTING=y
-# Drop flash accesses
-CONFIG_ENV_IS_IN_FLASH=n
-CONFIG_MTD=n
-CONFIG_MTD_NOR_FLASH=n
--- a/board/qemu/csky/linux-ck610.config.fragment
+++ b/board/qemu/csky/linux-ck610.config.fragment
@@ -1,6 +0,0 @@
-CONFIG_COMPILE_TEST=y
-CONFIG_CPU_CK610=y
-CONFIG_CPU_PM_WAIT=y
-CONFIG_RAM_BASE=0x10000000
-CONFIG_CSKY_APB_INTC=y
-CONFIG_GX6605S_TIMER=y
--- a/board/qemu/csky/linux-ck807.config.fragment
+++ b/board/qemu/csky/linux-ck807.config.fragment
@@ -1,5 +0,0 @@
-CONFIG_COMPILE_TEST=y
-CONFIG_CPU_CK807=y
-# CONFIG_CPU_HAS_FPU is not set
-CONFIG_CPU_PM_WAIT=y
-CONFIG_CSKY_APB_INTC=y
--- a/board/qemu/csky/linux-ck810.config.fragment
+++ b/board/qemu/csky/linux-ck810.config.fragment
@@ -1,5 +0,0 @@
-CONFIG_COMPILE_TEST=y
-CONFIG_CPU_CK810=y
-# CONFIG_CPU_HAS_FPU is not set
-CONFIG_CPU_PM_WAIT=y
-CONFIG_CSKY_APB_INTC=y
--- a/board/qemu/csky/linux-ck860.config.fragment
+++ b/board/qemu/csky/linux-ck860.config.fragment
@@ -1,9 +0,0 @@
-CONFIG_COMPILE_TEST=y
-CONFIG_CPU_CK860=y
-# CONFIG_CPU_HAS_FPU is not set
-CONFIG_CPU_PM_WAIT=y
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_CSKY_APB_INTC=y
-CONFIG_CSKY_MPINTC=y
-CONFIG_CSKY_MP_TIMER=y
--- a/board/qemu/csky/readme.txt
+++ b/board/qemu/csky/readme.txt
@@ -1,12 +0,0 @@
-Run with qemu:
-
-For ck860 smp:
- qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux
-
-For ck810/ck807:
- qemu-system-cskyv2 -M virt -nographic -kernel vmlinux
-
-For ck610:
- qemu-system-cskyv1 -M virt -nographic -kernel vmlinux
-
-The login prompt will appear in the terminal that started Qemu. Username is root and no password.
--- a/board/qemu/ppc-mac99/linux.fragment
+++ b/board/qemu/ppc-mac99/linux.fragment
@@ -1,3 +0,0 @@
-CONFIG_SERIAL_PMACZILOG=y
-CONFIG_SERIAL_PMACZILOG_TTYS=y
-CONFIG_SERIAL_PMACZILOG_CONSOLE=y
--- a/board/qemu/ppc-mac99/readme.txt
+++ b/board/qemu/ppc-mac99/readme.txt
@@ -1,5 +0,0 @@
-Run the emulation with:
-
-  qemu-system-ppc -nographic -vga none -M mac99 -cpu g4 -m 1G -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -net nic,model=sungem -net user -append "root=/dev/sda"
-
-Tested with QEMU 3.1.0
--- a/board/qemu/riscv32-virt/linux.config.fragment
+++ b/board/qemu/riscv32-virt/linux.config.fragment
@@ -0,0 +1,12 @@
+CONFIG_32BIT=y
+CONFIG_ARCH_RV32I=y
+# CONFIG_ARCH_RV64I is not set
+CONFIG_MAXPHYSMEM_2GB=y
+CONFIG_LBDAF=y
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_GENERIC_LIB_ASHLDI3=y
+CONFIG_GENERIC_LIB_ASHRDI3=y
+CONFIG_GENERIC_LIB_LSHRDI3=y
+CONFIG_GENERIC_LIB_UCMPDI2=y
+CONFIG_GENERIC_LIB_UMODDI3=y
--- a/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch
+++ b/board/qemu/riscv32-virt/patches/linux/0001-Revert-riscv-Use-latest-system-call-ABI.patch
@@ -1,66 +0,0 @@
-From 15f62343916fcb3cae82e618da28eaa82bc8c007 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Tue, 16 Apr 2019 09:03:41 -0700
-Subject: [PATCH] Revert "riscv: Use latest system call ABI"
-
-This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b.
-
-The latest RISC-V 32bit glibc submission doesn't work with this patch,
-so let's revert it. This revert can be reverted when the glibc
-submission is updated to work on the 5.1 kernel.
-
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
- arch/riscv/Kconfig                   | 1 +
- arch/riscv/include/uapi/asm/unistd.h | 5 ++++-
- arch/riscv/kernel/vdso/Makefile      | 2 --
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
-index eb56c82d8aa1..43dd2680c696 100644
--- a/arch/riscv/Kconfig
-+++ b/arch/riscv/Kconfig
-@@ -11,6 +11,7 @@ config 32BIT
- 
- config RISCV
- 	def_bool y
-+	select ARCH_32BIT_OFF_T if !64BIT
- 	# even on 32-bit, physical (and DMA) addresses are > 32-bits
- 	select PHYS_ADDR_T_64BIT
- 	select OF
-diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h
-index 0e2eeeb1fd27..486a288b454c 100644
--- a/arch/riscv/include/uapi/asm/unistd.h
-+++ b/arch/riscv/include/uapi/asm/unistd.h
-@@ -17,8 +17,11 @@
- 
- #ifdef __LP64__
- #define __ARCH_WANT_NEW_STAT
-#define __ARCH_WANT_SET_GET_RLIMIT
- #endif /* __LP64__ */
-+#define __ARCH_WANT_SET_GET_RLIMIT
-+#ifndef __LP64__
-+#define __ARCH_WANT_TIME32_SYSCALLS
-+#endif
- 
- #include <asm-generic/unistd.h>
- 
-diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
-index fec62b24df89..eed1c137f618 100644
--- a/arch/riscv/kernel/vdso/Makefile
-+++ b/arch/riscv/kernel/vdso/Makefile
-@@ -2,11 +2,9 @@
- 
- # Symbols present in the vdso
- vdso-syms  = rt_sigreturn
-ifdef CONFIG_64BIT
- vdso-syms += gettimeofday
- vdso-syms += clock_gettime
- vdso-syms += clock_getres
-endif
- vdso-syms += getcpu
- vdso-syms += flush_icache
- 
-- 
-2.21.0
-
--- a/board/raspberrypi/genimage-raspberrypi0.cfg
+++ b/board/raspberrypi/genimage-raspberrypi0.cfg
@@ -1,7 +1,7 @@
 image boot.vfat {
  vfat {
    files = {
-      "bcm2708-rpi-zero.dtb",
+      "bcm2708-rpi-b-plus.dtb",
      "rpi-firmware/bootcode.bin",
      "rpi-firmware/cmdline.txt",
      "rpi-firmware/config.txt",
--- a/board/raspberrypi/genimage-raspberrypi0w.cfg
+++ b/board/raspberrypi/genimage-raspberrypi0w.cfg
@@ -1,7 +1,7 @@
 image boot.vfat {
  vfat {
    files = {
-      "bcm2708-rpi-zero-w.dtb",
+      "bcm2708-rpi-0-w.dtb",
      "rpi-firmware/bootcode.bin",
      "rpi-firmware/cmdline.txt",
      "rpi-firmware/config.txt",
--- a/board/raspberrypi/genimage-raspberrypi4.cfg
+++ b/board/raspberrypi/genimage-raspberrypi4.cfg
@@ -1,30 +0,0 @@
-image boot.vfat {
-  vfat {
-    files = {
-      "bcm2711-rpi-4-b.dtb",
-      "rpi-firmware/cmdline.txt",
-      "rpi-firmware/config.txt",
-      "rpi-firmware/fixup4.dat",
-      "rpi-firmware/start4.elf",
-      "rpi-firmware/overlays",
-      "zImage"
-    }
-  }
-  size = 32M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext4"
-  }
-}
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -49,18 +49,10 @@ __EOF__

 done

-# Pass an empty rootpath. genimage makes a full copy of the given rootpath to
-# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk
-# space. We don't rely on genimage to build the rootfs image, just to insert a
-# pre-built one in the disk image.
-
-trap 'rm -rf "${ROOTPATH_TMP}"' EXIT
-ROOTPATH_TMP="$(mktemp -d)"
-
 rm -rf "${GENIMAGE_TMP}"

-genimage \
-	--rootpath "${ROOTPATH_TMP}"   \
+genimage                           \
+	--rootpath "${TARGET_DIR}"     \
 	--tmppath "${GENIMAGE_TMP}"    \
 	--inputpath "${BINARIES_DIR}"  \
 	--outputpath "${BINARIES_DIR}" \
--- a/board/raspberrypi/readme.txt
+++ b/board/raspberrypi/readme.txt
@@ -8,7 +8,6 @@ These instructions apply to all models of the Raspberry Pi:
  - the "enhanced" models A+ and B+,
  - the model B2 (aka Raspberry Pi 2)
  - the model B3 (aka Raspberry Pi 3).
-  - the model B4 (aka Raspberry Pi 4).

 How to build it
 ===============
@@ -35,10 +34,6 @@ For model 3 B and B+:

  $ make raspberrypi3_defconfig

-For model 4 B:
-
-  $ make raspberrypi4_defconfig
-
 Build the rootfs
 ----------------

@@ -62,7 +57,6 @@ After building, you should obtain this tree:
    +-- bcm2709-rpi-2-b.dtb         [1]
    +-- bcm2710-rpi-3-b.dtb         [1]
    +-- bcm2710-rpi-3-b-plus.dtb    [1]
-    +-- bcm2711-rpi-4-b.dtb         [1]
    +-- boot.vfat
    +-- rootfs.ext4
    +-- rpi-firmware/
@@ -78,7 +72,7 @@ After building, you should obtain this tree:
 [1] Not all of them will be present, depending on the RaspberryPi
    model you are using.

-[2] Only for the Raspberry Pi 3/4 Models (overlay pi3-miniuart-bt is needed
+[2] Only for the Raspberry Pi 3 Model (overlay pi3-miniuart-bt is needed
    to enable the RPi3 serial console otherwise occupied by the bluetooth
    chip). Alternative would be to disable the serial console in cmdline.txt
    and /etc/inittab.
--- a/board/raspberrypi4
+++ b/board/raspberrypi4
@@ -1 +0,0 @@
-raspberrypi
--- a/board/roseapplepi/post-build.sh
+++ b/board/roseapplepi/post-build.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-
-cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt
--- a/board/roseapplepi/post-image.sh
+++ b/board/roseapplepi/post-image.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+cp "${BOARD_DIR}/uEnv.txt" "${BINARIES_DIR}"
+
+genimage                           \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
+
+exit $?
--- a/board/sifive/hifive-unleashed/genimage.cfg
+++ b/board/sifive/hifive-unleashed/genimage.cfg
@@ -1,17 +0,0 @@
-image sdcard.img {
-	hdimage {
-		gpt = true
-	}
-
-	partition bootloader {
-		image = "fw_payload.bin"
-		offset = 1M
-		size = 32M
-		partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985
-	}
-
-	partition rootfs {
-		image = "rootfs.ext4"
-		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
-	}
-}
--- a/board/sifive/hifive-unleashed/linux.config.fragment
+++ b/board/sifive/hifive-unleashed/linux.config.fragment
@@ -1,16 +0,0 @@
-CONFIG_HZ_100=y
-CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p2 rootwait"
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_SERIAL_SIFIVE=y
-CONFIG_SERIAL_SIFIVE_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_SIFIVE=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_SIFIVE=y
-CONFIG_MMC=y
-CONFIG_MMC_SPI=y
-CONFIG_CLK_U54_PRCI=y
-CONFIG_CLK_GEMGXL_MGMT=y
-CONFIG_PWM=y
-CONFIG_PWM_SIFIVE=y
--- a/board/sifive/hifive-unleashed/readme.txt
+++ b/board/sifive/hifive-unleashed/readme.txt
@@ -1,75 +0,0 @@
-SiFive HiFive Unleashed
-=======================
-
-This file describes how to use the pre-defined Buildroot
-configuration for the SiFive HiFive Unleashed board.
-
-Further information about the HiFive Unleashed board can be found
-at https://www.sifive.com/boards/hifive-unleashed
-
-Building
-========
-
-Configure Buildroot using the default board configuration:
-
-  $ make hifive_unleashed_defconfig
-
-Customise the build as necessary:
-
-  $ make menuconfig
-
-Start the build:
-
-  $ make
-
-Result of the build
-===================
-
-Once the build has finished you will have the following files:
-
-    output/images/
-    +-- fw_jump.bin
-    +-- fw_jump.elf
-    +-- fw_payload.bin
-    +-- fw_payload.elf
-    +-- Image
-    +-- rootfs.ext2
-    +-- rootfs.ext4
-    +-- rootfs.tar
-    +-- sdcard.img
-
-
-Creating a bootable SD card with genimage
-=========================================
-
-Buildroot builds a SD card image for you. All you need to do is dd the
-image to your SD card, which can be done with the following command:
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=4096
-
-Booting the SD card on the board
-================================
-
-Make sure that the all DIP switches are set to the off position for
-default boot mode (MSEL mode = 1111), insert the SD card and power
-up the board.
-
-Connect the USB cable and open minicom (/dev/ttyUSB1, 115200, 8N1).
-
-See the 'SiFive HiFive Unleashed Getting Started Guide' for
-more details (https://www.sifive.com/documentation).
-
-You will get a warning reported by fdisk when you examine the SD card.
-This is because the genimage.cfg file doesn't specify the SD card size
-(as people will naturally have different sized cards), so the
-secondary GPT header is placed after the rootfs rather than at the end
-of the disk where it is expected to be.
-
-You will see something like this at boot time:
-
-[    2.318722] GPT:Primary header thinks Alt. header is not at the end of the disk.
-[    2.325390] GPT:190496 != 122142719
-[    2.328843] GPT:Alternate GPT header not at the end of the disk.
-[    2.334824] GPT:190496 != 122142719
-[    2.338302] GPT: Use GNU Parted to correct GPT errors.
-[    2.343456]  mmcblk0: p1 p2
--- a/board/solidrun/clearfog_gt_8k/extlinux.conf
+++ b/board/solidrun/clearfog_gt_8k/extlinux.conf
@@ -1,4 +0,0 @@
-label Clearfog GT-8K Linux
-  kernel /boot/Image
-  devicetree /boot/armada-8040-clearfog-gt-8k.dtb
-  append console=ttyS0,115200n8 root=/dev/mmcblk1p1 rootwait
--- a/board/solidrun/clearfog_gt_8k/genimage.cfg
+++ b/board/solidrun/clearfog_gt_8k/genimage.cfg
@@ -1 +0,0 @@
-../macchiatobin/genimage.cfg
--- a/board/solidrun/clearfog_gt_8k/linux-extras.config
+++ b/board/solidrun/clearfog_gt_8k/linux-extras.config
@@ -1,6 +0,0 @@
-CONFIG_MARVELL_PHY=y
-CONFIG_SFP=y
-CONFIG_IPV6=y
-CONFIG_BRIDGE=y
-CONFIG_NET_DSA=y
-CONFIG_NET_DSA_MV88E6XXX=y
--- a/board/solidrun/clearfog_gt_8k/post-build-mainline.sh
+++ b/board/solidrun/clearfog_gt_8k/post-build-mainline.sh
@@ -1 +0,0 @@
-../macchiatobin/post-build-mainline.sh
--- a/board/solidrun/clearfog_gt_8k/readme.txt
+++ b/board/solidrun/clearfog_gt_8k/readme.txt
@@ -1,61 +0,0 @@
-Intro
-=====
-
-The default configuration described below will allow you to start
-experimenting with the buildroot environment for the SolidRun Clearfog GT-8K
-based on the Marvell Armada 8040 SoC.
-
-This default configuration will bring up the board and allow shell command
-line access through the serial console.
-
-How to build
-============
-
-  $ make solidrun_clearfog_gt_8k_defconfig
-  $ make
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image file named
-"sdcard.img" in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync
-
-How to boot the board
-=====================
-
-The Clearfog GT-8K can be setup to load the bootloader from different sources
-including eMMC, SPI flash, and SD-card.
-
-To select boot from SD-card the DIP switches in SW6 (at the bottom of the
-board) should be configured as follows:
-
-  SW6: 11010
-
-Insert the micro SDcard in the Cleargfog GT-8K and power it up.
-
-Serial console
-==============
-
-The serial console is accessible at the J27 pins header (TTL UART) with the
-following pinout (pin #1 is marked with triangle on the PCB):
-
-  pin #1: Ground
-  pin #2: Armada 8040 Rx
-  pin #3: Armada 8040 Tx
-
-Enable the switch (yellow) Ethernet ports
-=========================================
-
-To enable the Clearfog GT-8K internal switch port make sure to load the
-'mv88e6xxx' kernel module, and up the switch up-link port (eth2 by default):
-
-  modprobe mv88e6xxx
-  ifconfig eth2 up
-
-Then you can configure each switch port separately. These port are named
-'lan1' to 'lan4' by default. 'lan1' is closest to the USB port, while 'lan4'
-is closest to the blue Ethernet port.
--- a/Show More
+++ b/Show More