Update for 2019.08.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/mongodb: security bump to version 4.0.12
2026-01-09 06:10:17 +03:00 · 2019-10-03 09:12:47 +02:00 · 2019-10-02 21:31:46 +02:00 · 2019-10-02 18:02:39 +02:00 · 2019-10-02 17:58:46 +02:00 · 2019-10-02 17:48:53 +02:00
4656 changed files with 41448 additions and 45653 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,8 +160,6 @@ bananapro_defconfig: { extends: .defconfig }
 beagleboardx15_defconfig: { extends: .defconfig }
 beaglebone_defconfig: { extends: .defconfig }
 beaglebone_qt5_defconfig: { extends: .defconfig }
-beagleboneai_defconfig: { extends: .defconfig }
-beelink_gs1_defconfig: { extends: .defconfig }
 chromebook_snow_defconfig: { extends: .defconfig }
 ci20_defconfig: { extends: .defconfig }
 csky_gx6605s_defconfig: { extends: .defconfig }
@@ -186,7 +184,6 @@ 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 }
@@ -203,7 +200,6 @@ 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 }
@@ -255,7 +251,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 }
@@ -297,7 +292,6 @@ raspberrypi2_defconfig: { extends: .defconfig }
 raspberrypi3_64_defconfig: { extends: .defconfig }
 raspberrypi3_defconfig: { extends: .defconfig }
 raspberrypi3_qt5we_defconfig: { extends: .defconfig }
-raspberrypi4_64_defconfig: { extends: .defconfig }
 raspberrypi4_defconfig: { extends: .defconfig }
 raspberrypi_defconfig: { extends: .defconfig }
 riotboard_defconfig: { extends: .defconfig }
@@ -318,7 +312,6 @@ 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 }
 ts4900_defconfig: { extends: .defconfig }
 ts5500_defconfig: { extends: .defconfig }
@@ -341,7 +334,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 }
@@ -375,30 +367,20 @@ tests.init.test_systemd.TestInitSystemSystemdRwFull: { extends: .runtime_test }
 tests.init.test_systemd.TestInitSystemSystemdRwIfupdown: { extends: .runtime_test }
 tests.init.test_systemd.TestInitSystemSystemdRwNetworkd: { extends: .runtime_test }
 tests.package.test_atop.TestAtop: { extends: .runtime_test }
-tests.package.test_crudini.TestCrudiniPy2: { extends: .runtime_test }
-tests.package.test_crudini.TestCrudiniPy3: { extends: .runtime_test }
 tests.package.test_docker_compose.TestDockerCompose: { extends: .runtime_test }
 tests.package.test_dropbear.TestDropbear: { extends: .runtime_test }
 tests.package.test_glxinfo.TestGlxinfo: { extends: .runtime_test }
 tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test }
-tests.package.test_libftdi1.TestPythonPy2Libftdi1: { extends: .runtime_test }
-tests.package.test_libftdi1.TestPythonPy3Libftdi1: { extends: .runtime_test }
 tests.package.test_lpeg.TestLuaLPeg: { extends: .runtime_test }
 tests.package.test_lpeg.TestLuajitLPeg: { extends: .runtime_test }
 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 }
@@ -415,11 +397,7 @@ 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_lxc.TestLxc: { extends: .runtime_test }
-tests.package.test_lzlib.TestLuaLzlib: { extends: .runtime_test }
 tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test }
-tests.package.test_opkg.TestOpkg: { extends: .runtime_test }
 tests.package.test_perl.TestPerl: { extends: .runtime_test }
 tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test }
 tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test }
@@ -443,11 +421,8 @@ tests.package.test_python_autobahn.TestPythonPy2Autobahn: { extends: .runtime_te
 tests.package.test_python_autobahn.TestPythonPy3Autobahn: { extends: .runtime_test }
 tests.package.test_python_automat.TestPythonPy2Automat: { extends: .runtime_test }
 tests.package.test_python_automat.TestPythonPy3Automat: { extends: .runtime_test }
-tests.package.test_python_avro.TestPythonAvro: { extends: .runtime_test }
 tests.package.test_python_bitstring.TestPythonPy2Bitstring: { extends: .runtime_test }
 tests.package.test_python_bitstring.TestPythonPy3Bitstring: { extends: .runtime_test }
-tests.package.test_python_can.TestPythonPy2Can: { extends: .runtime_test }
-tests.package.test_python_can.TestPythonPy3Can: { extends: .runtime_test }
 tests.package.test_python_cbor.TestPythonPy2Cbor: { extends: .runtime_test }
 tests.package.test_python_cbor.TestPythonPy3Cbor: { extends: .runtime_test }
 tests.package.test_python_click.TestPythonPy2Click: { extends: .runtime_test }
@@ -457,10 +432,6 @@ tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtim
 tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test }
 tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test }
 tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test }
-tests.package.test_python_django.TestPythonPy3Django: { extends: .runtime_test }
-tests.package.test_python_gitdb2.TestPythonPy2Gitdb2: { extends: .runtime_test }
-tests.package.test_python_gitdb2.TestPythonPy3Gitdb2: { extends: .runtime_test }
-tests.package.test_python_gobject.TestPythonPy2Gobject: { extends: .runtime_test }
 tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test }
 tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test }
 tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test }
@@ -473,8 +444,6 @@ tests.package.test_python_pyyaml.TestPythonPy2Pyyaml: { extends: .runtime_test }
 tests.package.test_python_pyyaml.TestPythonPy3Pyyaml: { extends: .runtime_test }
 tests.package.test_python_service_identity.TestPythonPy2ServiceIdentity: { extends: .runtime_test }
 tests.package.test_python_service_identity.TestPythonPy3ServiceIdentity: { extends: .runtime_test }
-tests.package.test_python_smmap2.TestPythonPy2Smmap2: { extends: .runtime_test }
-tests.package.test_python_smmap2.TestPythonPy3Smmap2: { extends: .runtime_test }
 tests.package.test_python_subprocess32.TestPythonPy2Subprocess32: { extends: .runtime_test }
 tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test }
 tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test }
@@ -491,8 +460,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 }
--- 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/668
+++ b/668
@@ -1,424 +1,3 @@
-2020.02-rc3, released March 2nd, 2020
-
-	Fixes all over the tree.
-
-	Infrastructure: Rework file list handling to fix race
-	conditions when building with per-package target and host
-	directories and top-level parallel builds.
-
-	Updated/fixed packages: aufs, binutils, blktrace, brltty,
-	cairo, dnsmasq, docker-compose, elf2flt, exim, exiv2, git,
-	kodi-inputstream-adaptive, libarchive, libcgroup, libgdiplus,
-	libssh2, libvncserver, libvorbis, linknx, linux-firmware, lxc,
-	lz4, mosquitto, openjpeg, openrc, poco, proftpd, pure-ftpd,
-	python3, python-multidict, python-setuptools-scm-git-archive,
-	qpdf, qt5tools, rdesktop, rocksdb, shellinabox, squid,
-	suricata, swig, systemd, taglib, util-linux, wireshark, zsh
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12571: ltp-testsuite : Build failure
-	#12576: 2020.02-RC1: error while loading shared libraries: ...
-	#12581: 2020.02-rc1 glibc failing to build on fedora 31
-
-2020.02-rc2, released February 26th, 2020
-
-	Fixes all over the tree.
-
-	Toolchain: Ensure strong SSP can only be enabled if the
-	(external) toolchain supports it.
-
-	Fix a race condition related to creating the output/staging
-	symlink on systems with coreutils < 8.27.
-
-	Drop support for the (end of life) Qt 5.6 variant.
-
-	Updated/fixed packages: at, armadillo, audiofile, bash,
-	busybox, erlang, fail2ban, fluidsynth, ipsec-tools, jpeg-turbo,
-	kvm-unit-tests, libftdi1, libinput, libsvgtiny, libtomcrypt,
-	libupnpp, libxml2, linux-tools, luv, mbedtls, mesa3d, minicom,
-	openvmtools, php, qt5, qt5webengine, qwt, radvd, rcw,
-	sdbusplus, systemd, tpm2-tss, vorbis-tools
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12581: 2020.02-rc1 glibc failing to build on fedora 31
-
-2020.02-rc1, released February 18th, 2020
-
-	Fixes all over the tree and new features.
-
-	Add experimental support for building with a per-package
-	target and host directory. This still has some rough edges,
-	but brings a number of advantages:
-
-	- Packages will only be able to access the explicitly listed
-          dependencies and not any other packages that happen to be
-          built before, ensuring correct dependency information in
-          Buildroot.
-
-	- Possibility for top-level parallel builds, speeding up
-          builds on multicore machines.
-
-	Core: Ensure package-file-lists data is correct after
-	incremental builds as well.
-
-	Architecture: Add support for ARC-HS38 with 64bit multiplier
-	variant, allow building glibc for big endian ARC, handle 16KB
-	MMU page size for ARC in toolchain wrapper.
-
-	Toolchain: Add binutils 2.33.1, GCC 7.5.0, Arm 9.2-2019.12
-	toolchains, ARC 2019.09 toolchain. Allow using custom kernel
-	headers newer than what is known by Buildroot.
-
-	pkg-stats: Support for CVE vulnerability reporting by
-	comparing to NVD database.
-
-	Reproducible builds: The go -trimpath option is now used to
-	get rid of absolute build paths, __FILE__ and __BASE_FILE__
-	defines are now handled in the toolchain wrapper.
-
-	Systemd: Build host variant and use systemctl to automatically
-	enable unit files rather than manually managing symlinks.
-
-	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+)
-
-	New defconfigs: Beelink GS1, Raspberrypi4 64bit
-
-	New packages: alura, avro-c, bubblewrap, cctz, cereal,
-	cpuburn-arm, elixir, erlang-base64url, erlang-idna,
-	erlang-jose, erlang-p1-acme, erlang-p1-mqtree,
-	erlang-p1-yconf, fluid-soundfont, fluidsynth, gcnano-binaries,
-	gensio, glslsandbox-player, libargon2, libmodsecurity,
-	libpam-nfc, libtelnet, lua-codegen, lua-livr, lua-livr-extra,
-	lua-rotas, lua-silva, mfoc, network-manager-openvpn,
-	nginx-modsecurity, perl-crypt-openssl-aes,
-	perl-math-prime-util, pipewire, ptm2human, python-aenum,
-	python-aiohttp-debugtoolbar, python-aiohttp-mako,
-	python-aiologstash, python-aiosignal, python-aiozipkin,
-	python-async-lru, python-avro, python-bunch, python-crontab,
-	python-dnspython, python-entrypoints, python-esptool,
-	python-frozenlist, python-future, python-gitdb, python-janus,
-	python-lockfile, python-logstash, python-nested-dict,
-	python-pbr, python-pyaes, python-pydantic, python-smmap2,
-	python-sockjs, python-zc-lockfile, raspi-gpio, rocksdb,
-	sdbusplus, spidermonkey, thermald, ti-sgx-libgbm, tinyssh,
-	tio, umtprd, weston-imx, wireguard-linux-compat,
-	wireguard-tools, xdg-dbus-proxy
-
-	Removed packages: bluez_utils, celt051, erlang-p1-iconv, fis,
-	gadgetfs-test, libplayer, gstreamer, gst-ffmpeg,
-	gst-fsl-plugins, gst-omapfb, gst-plugins-bad,
-	gst-plugins-base, gst-plugins-good, gst-plugins-ugly,
-	perl-digest-md5, perl-mime-base64, perl-net-ping,
-	python-scapy3k, wireguard
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#11906: the new version of mesa3d cannot support etnaviv when..
-	#11996: opencv3 SIGILL on Cortex-A5 with VFPv4-D16
-	#12121: PyQt5.QtSerialPort and other modules not being built
-	#12256: package tar is outdated (1.29 is 3 years old
-	#12286: Can't import gobject in python 3.8
-	#12376: python-scapy3k is deprecated
-	#12386: carriage return issue when "make menuconfig"
-	#12441: qt5webengine build error: asm/errno.h: No such file or..
-	#12446: Buildroot fails to finish installing packages
-	#12456: qtvirtualkeyboard: No such file or directory
-	#12461: libglib2 build files with deep directory structure
-	#12481: minicom fails when output directory path contains "m4"
-	#12501: libnss-3.49.1: ld error: multiple definition of `gcm_..
-	#12526: host-nodejs 12.14.1: configure fail: AttributeError: ..
-	#12536: Linux-Headers extracting failure
-	#12546: Ninja 1.10 build Error
-
-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.3, released December 7th, 2019
-
-	Important / security related 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.
-
-	Fix <pkg>-reconfigure handling for packages using the kconfig
-	infrastructure.
-
-	Toolchain: ensure external toolchain kernel headers version
-	check correctly stop the build on mismatch
-
-	Deconfigs: beaglebone: fix boot issue
-
-	Updated/fixed packages: am33x-cm3, asterisk, bind, chrony,
-	clamav, cmocka, collectd, connman, dhcp, dropwatch, faifa,
-	gettext-tiny, gob2, haproxy, intel-microcode, ipsec-tools,
-	jailhouse, jasper, jpeg-turbo, kodi, kvm-unit-tests, libftdi,
-	libftdi1, libnss, libressl, libstrophe, libsvgtiny, lvm2,
-	lzma, mariadb, minicom, mosquitto, neardal, ninja, nodejs,
-	oniguruma, openvmtools, oracle-mysql, perl-gdgraph,
-	perl-gdtextutil, php, postgresql, prosody, python-cchardet,
-	python-django, qt5wayland, rabbitmq, rauc, redis, rpcbind,
-	socat, spice, spice-protocol, tftpd, tiff, webkitgtk
-
-	New packages: libmspack
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12166: Compiling nodejs for SAMA5D3 always crash with illegal inst..
-	#12171: Python-opencv needs config.py and config-3.7.py to run..
-	#12211: host-nodejs 10.15.3 package fail to build
-	#12316: tzdata fails to install with empty "default local time"
-
-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.
@@ -616,80 +195,6 @@
 	#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.
-
-	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,
-	e2fsprogs, eudev, exim, expat, gcc, go, haveged, ifplugd,
-	iptables, joe, kf5-extra-cmake-modules, kf5-modemmanager-qt,
-	kf5-networkmanager-qtlibcamera, libcurl, libgcrypt,
-	libgpg-error, libnftl, libnspr, libnss, libopenssl,
-	libtorrent-rasterbar, luksmeta, mariadb, mbedtls, mongodb,
-	mosquitto, ncurses, nfs-utils, nghttp2, nodejs, openvmtools,
-	php, protobuf, putty, qemu, 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
-	#12241: Permission denied while running "make"
-
-2019.05.2, Released September 3rd, 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,
-	busybox, bzip2, clamav, cloop, cmake, collectd, connman-gtk,
-	dahdi-linux, dahdi-tools, daq, dehydrated, dhcp, 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, libgtk2, libgtk3, libmodplug, libnss, libpri,
-	libshout, libss7, libssh2, libvips, libxcb, linux-headers,
-	mdadm, mesa3d, metacity, mpg123, mosquitto, musl, nginx,
-	oniguruma, openblas, opencv3, openjdk, openjdk-bin, 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, 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
-	#12086: (dhcpd-missing-libs) - dhcp shared libraries not installed to..
-	#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.05.1, Released July 7th, 2019

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

-2019.02.9, released January 12th, 2020
-
-	Important / security related fixes.
-
-	pkg-python infrastructure: Ensure correct compiler and linker
-	flags are used for compiled code
-
-	utils/scanpypi: Remind users to update DEVELOPERS
-
-	Updated/fixed packages: busybox, cc-tool, cpio, cups, dante,
-	dillo, docker-cli, docker-containerd, docker-engine, easy-rsa,
-	ecryptfs-utils, efl, git, glibc, gnupg2, gst1-plugins-bad,
-	kf5-kcoreaddons, libarchive, libgit2, libkrb5, librsvg,
-	libssh, libtomcrypt, libuio, lirc-tools, lvm2,
-	matchbox-desktop, nodejs, ntp, opencv3, openpowerlink,
-	python-django, python-ecdsa, python-pyasn-modules,
-	python-pyqt5, python-subprocess32, python3, qpdf, runc, rygel,
-	samba4, sdl2, wavpack, xserver_xorg-server, zip
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12121: PyQt5.QtSerialPort and other modules not being built
-
-2019.02.8, released December 7th, 2019
-
-	Important / security related 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.
-
-	Fix <pkg>-reconfigure handling for packages using the kconfig
-	infrastructure.
-
-	Toolchain: ensure external toolchain kernel headers version
-	check correctly stop the build on mismatch
-
-	Deconfigs: beaglebone: fix boot issue
-
-	Updated/fixed packages: am33x-cm3, asterisk, bind, chrony,
-	clamav, collectd, connman, faifa, gob2, haproxy,
-	intel-microcode, ipsec-tools, jasper, jpeg-turbo, kodi,
-	kvm-unit-tests, libftdi, libftdi1, libnss, libstrophe,
-	libsvgtiny, lvm2, lzma, mariadb, minicom, neardal, nodejs,
-	opencv3, openvmtools, oracle-mysql, perl-gdgraph,
-	perl-gdtextutil, php, postgresql, prosody, python-django,
-	rabbitmq-c, rauc, redis, rpcbind, socat, spice,
-	spice-protocol, tftpd, tiff, webkitgtk
-
-	New packages: libmspack
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12166: Compiling nodejs for SAMA5D3 always crash with illegal inst..
-	#12171: Python-opencv needs config.py and config-3.7.py to run..
-	#12211: host-nodejs 10.15.3 package fail to build
-	#12316: tzdata fails to install with empty "default local time"
-
-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.
@@ -1061,8 +395,6 @@
 	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
--- a/Config.in
+++ b/Config.in
@@ -26,9 +26,29 @@ 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
@@ -50,11 +70,6 @@ config BR2_HOST_GCC_AT_LEAST_8
 	default y if BR2_HOST_GCC_VERSION = "8"
 	select BR2_HOST_GCC_AT_LEAST_7

-config BR2_HOST_GCC_AT_LEAST_9
-	bool
-	default y if BR2_HOST_GCC_VERSION = "9"
-	select BR2_HOST_GCC_AT_LEAST_8
-
 # When adding new entries above, be sure to update
 # the HOSTCC_MAX_VERSION variable in the Makefile.

@@ -541,6 +556,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
@@ -695,24 +711,6 @@ config BR2_REPRODUCIBLE
 	  This is labeled as an experimental feature, as not all
 	  packages behave properly to ensure reproducibility.

-config BR2_PER_PACKAGE_DIRECTORIES
-	bool "Use per-package directories (experimental)"
-	help
-	  This option will change the build process of Buildroot
-	  package to use per-package target and host directories.
-
-	  This is useful for two related purposes:
-
-	    - Cleanly isolate the build of each package, so that a
-	      given package only "sees" the dependencies it has
-	      explicitly expressed, and not other packages that may
-	      have by chance been built before.
-
-	    - Enable top-level parallel build.
-
-	  This is labeled as an experimental feature, as not all
-	  packages behave properly with per-package directories.
-
 endmenu

 comment "Security Hardening Options"
@@ -720,15 +718,10 @@ 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
@@ -763,7 +756,6 @@ config BR2_SSP_REGULAR

 config BR2_SSP_STRONG
 	bool "-fstack-protector-strong"
-	depends on BR2_TOOLCHAIN_HAS_SSP_STRONG
 	help
 	  Like -fstack-protector but includes additional functions to be
 	  protected - those that have local array definitions, or have
@@ -812,16 +804,12 @@ 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"
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -144,354 +144,6 @@ endif

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

-comment "Legacy options removed in 2020.02"
-
-config BR2_PACKAGE_QT5_VERSION_5_6
-	bool "qt 5.6 support removed"
-	select BR2_LEGACY
-	help
-	  Support for Qt 5.6 is EOL and has been removed. The current
-	  version (5.12 or later) has been selected instead.
-
-config BR2_PACKAGE_CURL
-	bool "BR2_PACKAGE_CURL was renamed"
-	select BR2_PACKAGE_LIBCURL_CURL
-	select BR2_LEGACY
-	help
-	  The BR2_PACKAGE_CURL config symbol was renamed to
-	  BR2_PACKAGE_LIBCURL_CURL.
-
-config BR2_PACKAGE_GSTREAMER
-	bool "gstreamer-0.10 removed"
-	select BR2_LEGACY
-	help
-	  Gstreamer-0.10 package was removed. It has been deprecated
-	  upstream since 2012, and is missing a lot of features and
-	  fixes compared to gstreamer-1.x.
-
-config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS
-	bool "nvidia-tegra23 binaries gstreamer 0.10.x support removed"
-	select BR2_LEGACY
-	help
-	  Gstreamer 0.10.x is no longer available in Buildroot, so
-	  neither is the support in nvidia-tegra23 binaries.
-
-config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS
-	bool "nvidia-tegra23 binaries sample apps removed"
-	select BR2_LEGACY
-	help
-	  Gstreamer 0.10.x is no longer available in Buildroot, so
-	  neither is the support in nvidia-tegra23 binaries.
-
-config BR2_PACKAGE_FREERDP_GSTREAMER
-	bool "freerdp gstreamer 0.10.x support removed"
-	select BR2_LEGACY
-	help
-	  Gstreamer 0.10.x is no longer available in Buildroot, so
-	  neither is the support in freerdp.
-
-config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER
-	bool "opencv3 gstreamer 0.10.x support removed"
-	select BR2_LEGACY
-	help
-	  Gstreamer 0.10.x is no longer available in Buildroot, so
-	  neither is the support in opencv3.
-
-config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
-	bool "opencv gstreamer 0.10.x support removed"
-	select BR2_LEGACY
-	help
-	  Gstreamer 0.10.x is no longer available in Buildroot, so
-	  neither is the support in opencv.
-
-config BR2_PACKAGE_LIBPLAYER
-	bool "libplayer package was removed"
-	select BR2_LEGACY
-	help
-	  The libplayer package was removed. The latest release is
-	  from 2010 and none of the backends are available in
-	  Buildroot any more.
-
-config BR2_GCC_VERSION_OR1K
-	bool "gcc 5.x fork for or1k has been removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc 5.x for or1k has been removed. The current
-	  default version (9.x or later) has been selected instead.
-
-config BR2_PACKAGE_BLUEZ_UTILS
-	bool "bluez-utils was removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_BLUEZ5_UTILS if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \
-		&& BR2_TOOLCHAIN_HAS_SYNC_4
-	help
-	  The bluez-utils (BlueZ 4.x) package was removed as it is
-	  deprecated since a long time. As an alternative, the
-	  bluez5-utils (BlueZ 5.x) has been automatically selected in
-	  your configuration.
-
-config BR2_PACKAGE_GADGETFS_TEST
-	bool "gadgetfs-test was removed"
-	select BR2_LEGACY
-	help
-	  The gadgetfs-test package was removed. Gadgetfs has been
-	  deprecated in favour of functionfs. Consider using
-	  gadget-tool (gt) instead.
-
-config BR2_PACKAGE_FIS
-	bool "fis was removed"
-	select BR2_LEGACY
-	help
-	  The fis package was removed.
-
-config BR2_PACKAGE_REFPOLICY_POLICY_VERSION
-	string "refpolicy policy version"
-	help
-	  The refpolicy policy version option has been moved to the
-	  libsepol package.
-
-config BR2_PACKAGE_REFPOLICY_POLICY_VERSION_WRAP
-	bool
-	default y if BR2_PACKAGE_REFPOLICY_POLICY_VERSION != ""
-	select BR2_LEGACY
-
-config BR2_PACKAGE_CELT051
-	bool "celt051 package was removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_OPUS
-	help
-	  The celt051 package was removed as it is now obsolete since
-	  the CELT codec has been merged into the IETF Opus codec. As
-	  a result, the opus package has been automatically selected
-	  in your configuration.
-
-config BR2_PACKAGE_WIREGUARD
-	bool "wireguard package renamed"
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
-	select BR2_LEGACY
-	select BR2_PACKAGE_WIREGUARD_LINUX_COMPAT if BR2_LINUX_KERNEL
-	select BR2_PACKAGE_WIREGUARD_TOOLS
-	help
-	  The wireguard package has been renamed to wireguard-tools
-	  for the userspace tooling and wireguard-linux-compat for the
-	  kernel side for legacy (<5.6) kernels to match upstream.
-
-config BR2_PACKAGE_PERL_NET_PING
-	bool "perl-net-ping was removed"
-	select BR2_LEGACY
-	help
-	  Net::Ping is a Perl core module (ie. bundled with perl).
-
-config BR2_PACKAGE_PERL_MIME_BASE64
-	bool "perl-mime-base64 was removed"
-	select BR2_LEGACY
-	help
-	  MIME::Base64 is a Perl core module (ie. bundled with perl).
-
-config BR2_PACKAGE_PERL_DIGEST_MD5
-	bool "perl-digest-md5 was removed"
-	select BR2_LEGACY
-	help
-	  Digest::MD5 is a Perl core module (ie. bundled with perl).
-
-config BR2_PACKAGE_ERLANG_P1_ICONV
-	bool "erlang-p1-iconv has been removed"
-	select BR2_LEGACY
-	help
-	  The erlang-p1-iconv package was no longer used by ejabberd,
-	  and was no longer maintained upstream, so it was removed.
-
-config BR2_KERNEL_HEADERS_5_3
-	bool "kernel headers version 5.3.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.3.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_PYTHON_SCAPY3K
-	bool "python-scapy3k is replaced by python-scapy"
-	select BR2_LEGACY
-	select BR2_PACKAGE_PYTHON_SCAPY
-	help
-	  python-scapy3k has been deprecated, since python-scapy has
-	  gained Python 3 support. Use BR2_PACKAGE_PYTHON_SCAPY
-	  instead.
-
-config BR2_BINUTILS_VERSION_2_30_X
-	bool "binutils version 2.30 support removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils version 2.30 has been removed. The
-	  current default version (2.31 or later) has been selected
-	  instead.
-
-config BR2_PACKAGE_RPI_USERLAND_START_VCFILED
-	bool "rpi-userland start vcfiled was removed"
-	select BR2_LEGACY
-	help
-	  The vcfiled support was removed upstream.
-
-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
--- a/295
+++ b/295
@@ -53,25 +53,12 @@ F:	package/openjdk/
 F:	package/openjdk-bin/
 F:	package/php/
 F:	package/policycoreutils/
-F:	package/polkit/
 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-gitdb2/
-F:	package/python-lockfile/
 F:	package/python-mutagen/
-F:	package/python-nested-dict/
-F:	package/python-pbr/
 F:	package/python-pip/
 F:	package/python-psycopg2/
-F:	package/python-smmap2/
 F:	package/python-sqlalchemy/
-F:	package/python-sqlparse/
 F:	package/python-visitor/
 F:	package/restorecond/
 F:	package/refpolicy/
@@ -79,16 +66,13 @@ F:	package/selinux-python/
 F:	package/semodule-utils/
 F:	package/setools/
 F:	package/sngrep/
-F:	package/spidermonkey/
 F:	package/systemd/
-F:	support/testing/tests/package/test_python_gobject.py

 N:	Adam Heinrich <adam@adamh.cz>
 F:	package/jack1/

 N:	Adrian Perez de Castro <aperez@igalia.com>
 F:	package/brotli/
-F:	package/bubblewrap/
 F:	package/cog/
 F:	package/libepoxy/
 F:	package/libwpe/
@@ -96,7 +80,6 @@ F:	package/webkitgtk/
 F:	package/woff2/
 F:	package/wpebackend-fdo/
 F:	package/wpewebkit/
-F:	package/xdg-dbus-proxy/

 N:	Adrien Gallouët <adrien@gallouet.fr>
 F:	package/bird/
@@ -107,9 +90,6 @@ F:	package/libmbim/
 F:	package/libqmi/
 F:	package/modem-manager/

-N:	Alex Michel <alex.michel@wiedemann-group.com>
-F:	package/network-manager-openvpn/
-
 N:	Alex Suykov <alex.suykov@gmail.com>
 F:	board/chromebook/snow/
 F:	configs/chromebook_snow_defconfig
@@ -123,12 +103,12 @@ F:	package/fastd/
 F:	package/libuecc/
 F:	package/putty/

-N:	Alexander Kurz <akurz@blala.de>
-F:	package/minimodem/
-
-N:	Alexander Lukichev <alexander.lukichev@gmail.com>
+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/

@@ -196,10 +176,8 @@ 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>
@@ -237,6 +215,7 @@ F:	package/arp-scan/
 F:	package/dehydrated/
 F:	package/freescale-imx/firmware-imx/
 F:	package/freescale-imx/imx-lib/
+F:	package/gstreamer/gst-fsl-plugins/
 F:	package/libpagekite/
 F:	package/lua-bit32/
 F:	package/owfs/
@@ -244,21 +223,15 @@ F:	package/python-bottle/
 F:	package/sqlcipher/
 F:	package/stress/

-N:	Arthur Courtel <arthur.courtel@smile.fr>
-F:	board/raspberrypi/genimage-raspberrypi4-64.cfg
-F:	configs/raspberrypi4_64_defconfig
-
 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/

@@ -272,10 +245,7 @@ F:	package/lua-ev/
 F:	package/orbit/

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

 N:	Bartosz Golaszewski <brgl@bgdev.pl>
 F:	package/autoconf-archive/
@@ -292,7 +262,6 @@ 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/cpuburn-arm/
 F:	package/daemon/
 F:	package/dropbear/
 F:	package/ebtables/
@@ -318,11 +287,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/
@@ -334,7 +303,6 @@ 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/
@@ -372,7 +340,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/
@@ -414,6 +381,7 @@ F:	package/perl-io-html/
 F:	package/perl-lwp-mediatypes/
 F:	package/perl-mail-dkim/
 F:	package/perl-mailtools/
+F:	package/perl-mime-base64/
 F:	package/perl-net-dns/
 F:	package/perl-net-http/
 F:	package/perl-netaddr-ip/
@@ -449,7 +417,6 @@ 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/
@@ -458,7 +425,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>
@@ -479,13 +445,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/
@@ -529,6 +492,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/
@@ -610,10 +574,7 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/policycoreutils/
-
-N:	Clément Péron <peron.clem@gmail.com>
-F:	board/beelink/gs1/
-F:	configs/beelink_gs1_defconfig
+F:	package/ustr/

 N:	Corentin Guillevic <corentin.guillevic@smile.fr>
 F:	package/libloki/
@@ -632,6 +593,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/
@@ -714,7 +678,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
@@ -758,7 +721,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/
@@ -823,6 +785,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/
@@ -886,7 +852,6 @@ F:	package/pcmanfm/
 F:	package/python-backcall/
 F:	package/python-jedi/
 F:	package/python-parso/
-F:	package/rocksdb/
 F:	package/rygel/
 F:	package/safeclib/
 F:	package/suricata/
@@ -907,14 +872,11 @@ 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/
@@ -958,11 +920,6 @@ F:	package/ucl/
 F:	package/upx/
 F:	package/zxing-cpp/

-N:	Frank Vanbever <frank.vanbever@essensium.com>
-F: 	package/elixir/
-F:	package/libmodsecurity/
-F:	package/nginx-modsecurity/
-
 N:	Gaël Portay <gael.portay@collabora.com>
 F:	package/qt5/qt5virtualkeyboard/
 F:	package/qt5/qt5webengine/
@@ -986,33 +943,20 @@ 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/cctz/
 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/

@@ -1031,8 +975,6 @@ F:	package/bluez5_utils-headers/
 F:	package/f2fs-tools/
 F:	package/pigpio/
 F:	package/python-aioblescan/
-F:	package/python-bluezero/
-F:	package/python-crontab/
 F:	package/python-falcon/
 F:	package/python-ifaddr/
 F:	package/python-hiredis/
@@ -1040,7 +982,6 @@ 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>
@@ -1074,11 +1015,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/

@@ -1142,37 +1078,24 @@ F:	configs/pine64_defconfig
 F:	configs/pine64_sopine_defconfig

 N:	James Hilliard <james.hilliard1@gmail.com>
-F:	package/gensio/
 F:	package/lua-std-debug/
 F:	package/lua-std-normalize/
-F:	package/pipewire/
 F:	package/python-aioconsole/
 F:	package/python-aiodns/
 F:	package/python-aiohttp/
 F:	package/python-aiohttp-cors/
-F:	package/python-aiohttp-debugtoolbar/
 F:	package/python-aiohttp-jinja2/
-F:	package/python-aiohttp-mako/
 F:	package/python-aiohttp-remotes/
 F:	package/python-aiohttp-security/
 F:	package/python-aiohttp-session/
 F:	package/python-aiohttp-sse/
-F:	package/python-aiologstash/
 F:	package/python-aiomonitor/
 F:	package/python-aiojobs/
 F:	package/python-aiorwlock/
-F:	package/python-aiosignal/
-F:	package/python-aiozipkin/
-F:	package/python-async-lru/
 F:	package/python-async-timeout/
-F:	package/python-brotli/
 F:	package/python-cchardet/
-F:	package/python-frozenlist/
-F:	package/python-janus/
-F:	package/python-logstash/
 F:	package/python-multidict/
 F:	package/python-pycares/
-F:	package/python-sockjs/
 F:	package/python-terminaltables/
 F:	package/python-yarl/

@@ -1197,9 +1120,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/
@@ -1218,9 +1138,6 @@ F:	package/quota/
 N:	Jason Pruitt <jrspruitt@gmail.com>
 F:	package/librtlsdr/

-N:	Jens Kleintje <scooby22@web.de>
-F:	package/gcnano-binaries/
-
 N:	Jens Rosenboom <j.rosenboom@x-ion.de>
 F:	package/sl/

@@ -1244,10 +1161,6 @@ F:	package/wmctrl/
 F:	package/x11r7/xdriver_xf86-video-imx/
 F:	package/x11r7/xdriver_xf86-video-imx-viv/

-N:	Joao Pinto <jpinto@synopsys.com>
-F:	board/synopsys/vdk/
-F:	configs/snps_aarch64_vdk_defconfig
-
 N:	Joel Carlson <JoelsonCarl@gmail.com>
 F:	package/c-capnproto/
 F:	package/capnproto/
@@ -1267,18 +1180,13 @@ F:	package/python-libconfig/

 N:	Johan Oudinet <johan.oudinet@gmail.com>
 F:	package/ejabberd/
-F:	package/erlang-base64url/
 F:	package/erlang-eimp/
 F:	package/erlang-goldrush/
-F:	package/erlang-idna/
 F:	package/erlang-jiffy/
-F:	package/erlang-jose/
 F:	package/erlang-lager/
-F:	package/erlang-p1-acme/
 F:	package/erlang-p1-cache-tab/
-F:	package/erlang-p1-mqtree/
+F:	package/erlang-p1-iconv/
 F:	package/erlang-p1-oauth2/
-F:	package/erlang-p1-pkix/
 F:	package/erlang-p1-sip/
 F:	package/erlang-p1-stringprep/
 F:	package/erlang-p1-stun/
@@ -1287,7 +1195,6 @@ F:	package/erlang-p1-utils/
 F:	package/erlang-p1-xml/
 F:	package/erlang-p1-xmpp/
 F:	package/erlang-p1-yaml/
-F:	package/erlang-p1-yconf/
 F:	package/erlang-p1-zlib/
 F:	package/nginx-dav-ext/

@@ -1296,7 +1203,6 @@ F:	package/dhcpcd/

 N:	John Faith <jfaith@impinj.com>
 F:	package/python-inflection/
-F:	package/sdbusplus/

 N:	Jonathan Ben Avraham <yba@tkos.co.il>
 F:	arch/Config.in.xtensa
@@ -1307,16 +1213,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/
@@ -1342,7 +1247,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/
@@ -1384,8 +1288,6 @@ N:	Julien Corjon <corjon.j@ecagroup.com>
 F:	package/qt5/

 N:	Julien Grossholtz <julien.grossholtz@openest.io>
-F:	board/technologic/ts7680/
-F:	configs/ts7680_defconfig
 F:	package/paho-mqtt-c

 N:	Julien Olivain <juju@cotds.org>
@@ -1393,10 +1295,6 @@ F:	board/technexion/imx8mmpico/
 F:	board/technexion/imx8mpico/
 F:	configs/imx8mmpico_defconfig
 F:	configs/imx8mpico_defconfig
-F:	package/fluid-soundfont/
-F:	package/fluidsynth/
-F:	package/glslsandbox-player/
-F:	package/ptm2human/

 N:	Julien Viard de Galbert <julien@vdg.name>
 F:	package/dieharder/
@@ -1451,25 +1349,11 @@ F:	package/mongrel2/

 N:	Lothar Felten <lothar.felten@gmail.com>
 F:	board/bananapi/bananapi-m2-ultra/
-F:	board/beaglebone/
 F:	configs/bananapi_m2_ultra_defconfig
-F:	configs/beaglebone_defconfig
-F:	configs/beaglebone_qt5_defconfig
 F:	package/ti-sgx-demos/
-F:	package/ti-sgx-libgbm/
 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/mfoc
-F:	package/libpam-nfc
-F:	package/python-dnspython/
-F:	package/python-future/
-F:	package/python-huepy/
-F:	package/python-tqdm/
-
 N:	Louis-Paul Cordier <lpdev@cordier.org>
 F:	package/intel-gmmlib/
 F:	package/intel-mediadriver/
@@ -1561,11 +1445,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

@@ -1589,10 +1474,6 @@ F:	package/tslib/
 F:	package/x11r7/xdriver_xf86-input-tslib/
 F:	package/x11vnc/

-N:	Masahiro Yamada <yamada.masahiro@socionext.com>
-F:	board/arm/foundation-v8/
-F:	configs/arm_foundationv8_defconfig
-
 N:	Mathieu Audat <mathieuaudat@gmail.com>
 F:	board/technologic/ts4900/
 F:	configs/ts4900_defconfig
@@ -1616,6 +1497,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/
@@ -1633,7 +1515,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/
@@ -1663,7 +1544,6 @@ F:	package/policycoreutils/
 F:	package/proftpd/
 F:	package/protobuf-c/
 F:	package/protobuf/
-F:	package/python-bunch/
 F:	package/python-colorama/
 F:	package/python-flask-cors/
 F:	package/python-iptables/
@@ -1690,8 +1570,6 @@ F:	package/wireless_tools/
 F:	package/xen/
 F:	support/testing/tests/package/br2-external/openjdk/
 F:	support/testing/tests/package/test_openjdk.py
-F:	support/testing/tests/package/test_opkg/
-F:	support/testing/tests/package/test_opkg.py

 N:	Mauro Condarelli <mc5686@mclink.it>
 F:	package/mc/
@@ -1756,10 +1634,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/
@@ -1768,19 +1642,11 @@ F:	package/python-pyzmq/
 N:	Michael Trimarchi <michael@amarulasolutions.com>
 F:	package/python-spidev/

-N:	Michael Vetter <jubalh@iodoru.org>
-F:	package/jasper/
-F:	package/libstrophe/
-
-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/

@@ -1802,6 +1668,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/
@@ -1817,13 +1686,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:	Nicholas Sielicki <sielicki@yandex.com>
-F:	board/intel/galileo/
-F:	configs/galileo_defconfig
-
 N:	Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
 F:	package/libgit2/

@@ -1831,7 +1693,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/
@@ -1885,42 +1746,27 @@ F:	package/checksec/
 N:	Parnell Springmeyer <parnell@digitalmentat.com>
 F:	package/scrypt/

-N:	Pascal de Bruijn <p.debruijn@unilogic.nl>
-F:	package/libargon2/
-F:	package/linux-tools/S10hyperv
-F:	package/linux-tools/hyperv*.service
-F:	package/linux-tools/linux-tool-hv.mk.in
-
 N:	Pascal Huerst <pascal.huerst@gmail.com>
 F:	package/google-breakpad/

 N:	Patrick Gerber <kpa_info@yahoo.fr>
 F:	package/yavta/

-N:	Patrick Havelange <patrick.havelange@essensium.com>
-F:	support/testing/tests/package/test_lxc.py
-F:	support/testing/tests/package/test_lxc/
-
 N:	Paul Cercueil <paul@crapouillou.net>
 F:	package/libiio/
 F:	package/lightning/
-F:	package/umtprd/

 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
@@ -1965,9 +1811,6 @@ F:	package/python-websocket-client/
 F:	package/sedutil/
 F:	package/tpm2-totp/
 F:	package/triggerhappy/
-F:	package/wireguard-linux-compat/
-F:	package/wireguard-tools/
-F:	support/testing/tests/package/test_docker_compose.py

 N:	Peter Seiderer <ps.report@gmx.net>
 F:	board/raspberrypi/
@@ -2001,13 +1844,10 @@ 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/libtirpc/
 F:	package/linux-backports/
 F:	package/ltp-testsuite/
-F:	package/nfs-utils/
 F:	support/kconfig/

 N:	Phil Eichinger <phil.eichinger@gmail.com>
@@ -2038,22 +1878,14 @@ 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/ipset/
 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/raspi-gpio/
-F:	package/sbc/
 F:	package/stunnel/
-F:	package/tree/

 N:	Pieter De Gendt <pieter.degendt@gmail.com>
 F:	package/libvips/
@@ -2095,7 +1927,6 @@ F:	package/lirc-tools/

 N:	Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
 F:	package/atop/
-F:	package/thermald/

 N:	Ricardo Martincoski <ricardo.martincoski@gmail.com>
 F:	support/testing/infra/
@@ -2105,7 +1936,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/
@@ -2114,6 +1944,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/

@@ -2126,14 +1960,9 @@ F:	package/irssi/
 F:	package/vnstat/

 N:	Romain Naour <romain.naour@gmail.com>
-F:	board/qemu/
-F:	configs/qemu_*
-F:	package/alure/
 F:	package/aubio/
 F:	package/binutils/
 F:	package/bullet/
-F:	package/clang/
-F:	package/clinfo/
 F:	package/efl/
 F:	package/enet/
 F:	package/enlightenment/
@@ -2144,17 +1973,14 @@ 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/
@@ -2168,8 +1994,9 @@ 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/
@@ -2180,6 +2007,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/
@@ -2192,8 +2020,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/
@@ -2212,9 +2041,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/

@@ -2250,9 +2076,7 @@ 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>
@@ -2265,7 +2089,6 @@ F:	package/libgdiplus/
 F:	package/pimd/
 F:	package/snort/
 F:	package/stella/
-F:	package/tio/
 F:	package/traceroute/
 F:	package/tunctl/
 F:	package/ubus/
@@ -2325,9 +2148,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/
@@ -2353,12 +2173,17 @@ 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/

 N:	Theo Debrouwere <t.debrouwere@televic.com>
-F:	board/beagleboardx15/
-F:	configs/beagleboardx15_defconfig
 F:	package/pugixml/

 N:	Thierry Bultel <tbultel@free.fr>
@@ -2370,23 +2195,20 @@ 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/

 N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
-F:	package/cereal/
-F:	package/libtelnet/
 F:	package/opkg-utils/
 F:	package/perl-convert-asn1/
 F:	package/perl-crypt-blowfish/
 F:	package/perl-crypt-cbc/
-F:	package/perl-crypt-openssl-aes/
-F:	package/perl-math-prime-util/
+F:	package/perl-digest-md5/
 F:	package/perl-mime-base64-urlsafe/
 F:	package/perl-mojolicious-plugin-authentication/
+F:	package/perl-net-ping/
 F:	package/perl-net-snmp/
 F:	package/perl-net-ssh2/
 F:	package/perl-net-telnet/
@@ -2401,11 +2223,9 @@ 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/
@@ -2438,7 +2258,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
@@ -2462,19 +2281,12 @@ N:	Timo Ketola <timo.ketola@exertus.fi>
 F:	package/fbgrab/

 N:	Titouan Christophe <titouan.christophe@railnova.eu>
-F:	package/avro-c/
 F:	package/mosquitto/
-F:	package/python-avro/
 F:	package/redis/
-F:	package/waf/
-F:	support/testing/tests/package/test_crudini.py

 N:	Trent Piepho <tpiepho@impinj.com>
 F:	package/libp11/

-N:	Tudor Holton <buildroot@tudorholton.com>
-F:	package/openjdk/
-
 N:	Tzu-Jung Lee <roylee17@gmail.com>
 F:	package/dropwatch/
 F:	package/tstools/
@@ -2482,7 +2294,6 @@ F:	package/tstools/
 N:	Vadim Kochan <vadim4j@gmail.com>
 F:	package/brcm-patchram-plus/
 F:	package/gettext-tiny/
-F:	package/tinyssh/

 N:	Valentin Korenblit <valentinkorenblit@gmail.com>
 F:	package/clang/
@@ -2493,9 +2304,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/
@@ -2548,6 +2356,7 @@ F:	configs/nanopi_neo_defconfig
 F:	fs/squashfs/
 F:	package/asterisk/
 F:	package/cegui06/
+F:	package/celt051/
 F:	package/dahdi-linux/
 F:	package/dahdi-tools/
 F:	package/dtc/
@@ -2595,6 +2404,7 @@ F:	configs/beaglebone_defconfig
 F:	configs/beaglebone_qt5_defconfig
 F:	package/acl/
 F:	package/attr/
+F:	package/bluez_utils/
 F:	package/boost/
 F:	package/bootstrap/
 F:	package/cannelloni/
@@ -2607,7 +2417,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/
@@ -2617,7 +2426,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/
@@ -2627,22 +2435,17 @@ 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/
 F:	package/x11r7/xapp_xconsole/
 F:	package/x11r7/xapp_xinput-calibrator/
 F:	package/zlog/
-F:	support/testing/tests/package/test_libftdi1.py
-F:	support/testing/tests/package/test_python_can.py
 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/77
+++ b/77
@@ -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 := 2020.02-rc3
+export BR2_VERSION := 2019.08.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1583189900
+BR2_VERSION_EPOCH = 1570086600

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -204,7 +204,6 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf)
 BUILD_DIR := $(BASE_DIR)/build
 BINARIES_DIR := $(BASE_DIR)/images
 BASE_TARGET_DIR := $(BASE_DIR)/target
-PER_PACKAGE_DIR := $(BASE_DIR)/per-package
 # initial definition so that 'make clean' works for most users, even without
 # .config. HOST_DIR will be overwritten later when .config is included.
 HOST_DIR := $(BASE_DIR)/host
@@ -227,12 +226,21 @@ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 -include $(BR2_CONFIG)
 endif

-ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),)
-# Disable top-level parallel build if per-package directories is not
-# used. Indeed, per-package directories is necessary to guarantee
-# determinism and reproducibility with top-level parallel build.
+# Parallel execution of this Makefile is disabled because it changes
+# the packages building order, that can be a problem for two reasons:
+# - If a package has an unspecified optional dependency and that
+#   dependency is present when the package is built, it is used,
+#   otherwise it isn't (but compilation happily proceeds) so the end
+#   result will differ if the order is swapped due to parallel
+#   building.
+# - Also changing the building order can be a problem if two packages
+#   manipulate the same file in the target directory.
+#
+# Taking into account the above considerations, if you still want to execute
+# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and
+# use the -j<jobs> option when building, e.g:
+#      make -j$((`getconf _NPROCESSORS_ONLN`+1))
 .NOTPARALLEL:
-endif

 # timezone and locale may affect build output
 ifeq ($(BR2_REPRODUCIBLE),y)
@@ -340,7 +348,7 @@ export HOSTARCH := $(shell LC_ALL=C $(HOSTCC_NOCCACHE) -v 2>&1 | \

 # When adding a new host gcc version in Config.in,
 # update the HOSTCC_MAX_VERSION variable:
-HOSTCC_MAX_VERSION := 9
+HOSTCC_MAX_VERSION := 8

 HOSTCC_VERSION := $(shell V=$$($(HOSTCC_NOCCACHE) --version | \
 	sed -n -r 's/^.* ([0-9]*)\.([0-9]*)\.([0-9]*)[ ]*.*/\1 \2/p'); \
@@ -444,24 +452,19 @@ XZCAT := $(call qstrip,$(BR2_XZCAT))
 LZCAT := $(call qstrip,$(BR2_LZCAT))
 TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf

-ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
-HOST_DIR = $(if $(PKG),$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/host,$(call qstrip,$(BR2_HOST_DIR)))
-TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(if $(PKG),$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/target,$(BASE_TARGET_DIR)))
-else
+# packages compiled for the host go here
 HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))
+
+# The target directory is common to all packages,
+# but there is one that is specific to each filesystem.
 TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR))
-endif

 ifneq ($(HOST_DIR),$(BASE_DIR)/host)
 HOST_DIR_SYMLINK = $(BASE_DIR)/host
 $(HOST_DIR_SYMLINK): $(BASE_DIR)
-	ln -snf $(HOST_DIR) $(HOST_DIR_SYMLINK)
+	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)"

@@ -590,8 +593,8 @@ world: target-post-image
 .PHONY: prepare-sdk
 prepare-sdk: world
 	@$(call MESSAGE,"Rendering the SDK relocatable")
-	PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath host
-	PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath staging
+	$(TOPDIR)/support/scripts/fix-rpath host
+	$(TOPDIR)/support/scripts/fix-rpath staging
 	$(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh
 	mkdir -p $(HOST_DIR)/share/buildroot
 	echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
@@ -724,19 +727,19 @@ $(TARGETS_ROOTFS): target-finalize
 # Avoid the rootfs name leaking down the dependency chain
 target-finalize: ROOTFS=

-.PHONY: host-finalize
-host-finalize: $(PACKAGES) $(HOST_DIR) $(HOST_DIR_SYMLINK)
-	@$(call MESSAGE,"Finalizing host directory")
-	$(call per-package-rsync,$(sort $(PACKAGES)),host,$(HOST_DIR))
+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) $(TARGET_DIR) host-finalize
+target-finalize: $(PACKAGES) host-finalize
 	@$(call MESSAGE,"Finalizing target directory")
-	$(call per-package-rsync,$(sort $(PACKAGES)),target,$(TARGET_DIR))
 	# 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 \
@@ -776,7 +779,7 @@ endif
 	ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc

 	@$(call MESSAGE,"Sanitizing RPATH in target tree")
-	PER_PACKAGE_DIR=$(PER_PACKAGE_DIR) $(TOPDIR)/support/scripts/fix-rpath target
+	$(TOPDIR)/support/scripts/fix-rpath target

 # For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
 # counterparts are appropriately setup as symlinks ones to the others.
@@ -804,13 +807,6 @@ endif # merged /usr

 	touch $(TARGET_DIR)/usr

-	cat $(sort $(wildcard $(BUILD_DIR)/*/.files-list.txt)) > \
-		$(BUILD_DIR)/packages-file-list.txt
-	cat $(sort $(wildcard $(BUILD_DIR)/*/.files-list-host.txt)) > \
-		$(BUILD_DIR)/packages-file-list-host.txt
-	cat $(sort $(wildcard $(BUILD_DIR)/*/.files-list-staging.txt)) > \
-		$(BUILD_DIR)/packages-file-list-staging.txt
-
 .PHONY: target-post-image
 target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize
 	@rm -f $(ROOTFS_COMMON_TAR)
@@ -896,8 +892,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:
@@ -1021,7 +1016,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile

 # staging and target directories do NOT list these as
 # dependencies anywhere else
-$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR):
+$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST):
 	@mkdir -p $@

 # outputmakefile generates a Makefile in the output directory, if using a
@@ -1053,7 +1048,7 @@ printvars:
 clean:
 	rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \
 		$(BUILD_DIR) $(BASE_DIR)/staging \
-		$(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR)
+		$(LEGAL_INFO_DIR) $(GRAPHS_DIR)

 .PHONY: distclean
 distclean: clean
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -15,17 +15,11 @@ config BR2_archs38
 	bool "ARC HS38"
 	help
 	  Generic ARC HS capable of running Linux, i.e. with MMU,
-	  caches and 32-bit multiplier. Also it corresponds to the
-	  default configuration in older GNU toolchain versions.
+	  caches and multiplier. Also it corresponds to the default
+	  configuration in older GNU toolchain versions.

-config BR2_archs38_64mpy
-	bool "ARC HS38 with 64-bit mpy"
-	help
-	  Fully featured ARC HS capable of running Linux, i.e. with
-	  MMU, caches and 64-bit multiplier.
-
-	  If you're not sure which version of ARC HS core you build
-	  for use this one.
+	  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"
@@ -49,7 +43,7 @@ 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_64mpy || BR2_archs38_full || BR2_archs4x_rel31
+	default y if BR2_arc770d || BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31

 config BR2_ARCH
 	default "arc"	if BR2_arcle
@@ -67,13 +61,12 @@ config BR2_GCC_TARGET_CPU
 	default "arc700" if BR2_arc750d
 	default "arc700" if BR2_arc770d
 	default "archs"	 if BR2_archs38
-	default "hs38"	 if BR2_archs38_64mpy
 	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_64mpy || BR2_archs38_full || BR2_archs4x_rel31
+	default "ARCv2"		if BR2_archs38 || BR2_archs38_full || BR2_archs4x_rel31

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

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

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

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

 endchoice

--- 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"
--- a/arch/arch.mk.arc
+++ b/arch/arch.mk.arc
@@ -1,17 +1,4 @@
-ifeq ($(BR2_arc),y)
-
 # -matomic is always required when the ARC core has the atomic extensions
-ifeq ($(BR2_ARC_ATOMIC_EXT),y)
+ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy)
 ARCH_TOOLCHAIN_WRAPPER_OPTS = -matomic
 endif
-
-# Explicitly set LD's "max-page-size" instead of relying on some defaults
-ifeq ($(BR2_ARC_PAGE_SIZE_4K),y)
-ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096
-else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y)
-ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192
-else ifeq ($(BR2_ARC_PAGE_SIZE_16K),y)
-ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384
-endif
-
-endif
--- 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/linux-4.1-sgx.fragment
+++ b/board/beaglebone/linux-4.1-sgx.fragment
@@ -10,4 +10,3 @@ CONFIG_DRM_OMAP_WB_M2M=y
 CONFIG_DRM_TILCDC=y
 CONFIG_DRM_I2C_NXP_TDA998X=y
 CONFIG_DRM=y
-CONFIG_DRM_LEGACY=y
--- 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/post-image.sh
+++ b/board/beaglebone/post-image.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# post-image.sh for CircuitCo BeagleBone and TI am335x-evm
+# 2014, Marcin Jabrzyk <marcin.jabrzyk@gmail.com>
+# 2016, Lothar Felten <lothar.felten@gmail.com>
+
+BOARD_DIR="$(dirname $0)"
+
+# copy the uEnv.txt to the output/images directory
+cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt
+
+# the 4.1 kernel does not provide a dtb for beaglebone green, so we
+# use a different genimage config if am335x-bonegreen.dtb is not
+# built:
+if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then
+	GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+else
+	GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg"
+fi
+
+GENIMAGE_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/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/beelink/gs1/extlinux.conf
+++ b/board/beelink/gs1/extlinux.conf
@@ -1,4 +0,0 @@
-label linux
-  kernel /Image
-  devicetree /sun50i-h6-beelink-gs1.dtb
-  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
--- a/board/beelink/gs1/genimage.cfg
+++ b/board/beelink/gs1/genimage.cfg
@@ -1,33 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"sun50i-h6-beelink-gs1.dtb",
-			"extlinux"
-		}
-	}
-	size = 64M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8192
-		size = 1040384 # 1MB - 8192
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
--- a/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch
+++ b/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch
@@ -1,39 +0,0 @@
-From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
-Date: Tue, 9 Apr 2019 00:15:06 +0200
-Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some Allwinner H6 has a broken watchdog that doesn't
-make the soc reboot.
-
-Use the R_WATCHDOG instead.
-
-Signed-off-by: Clément Péron <peron.clem@gmail.com>
-Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba
---
- plat/allwinner/common/sunxi_pm.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c
-index 1d2dc938..13e13532 100644
--- a/plat/allwinner/common/sunxi_pm.c
-+++ b/plat/allwinner/common/sunxi_pm.c
-@@ -20,9 +20,9 @@
- #include <sunxi_mmap.h>
- #include <sunxi_private.h>
- 
-#define SUNXI_WDOG0_CTRL_REG		(SUNXI_WDOG_BASE + 0x0010)
-#define SUNXI_WDOG0_CFG_REG		(SUNXI_WDOG_BASE + 0x0014)
-#define SUNXI_WDOG0_MODE_REG		(SUNXI_WDOG_BASE + 0x0018)
-+#define SUNXI_WDOG0_CTRL_REG		(SUNXI_R_WDOG_BASE + 0x0010)
-+#define SUNXI_WDOG0_CFG_REG		(SUNXI_R_WDOG_BASE + 0x0014)
-+#define SUNXI_WDOG0_MODE_REG		(SUNXI_R_WDOG_BASE + 0x0018)
- 
- #define mpidr_is_valid(mpidr) ( \
- 	MPIDR_AFFLVL3_VAL(mpidr) == 0 && \
-- 
-2.20.1
-
--- a/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch
+++ b/board/beelink/gs1/patches/uboot/0001-arm-dts-sync-dts-for-Allwinner-H6.patch
@@ -1,279 +0,0 @@
-From 99cade8743158889b3e8db93c003b3318ebd4bda Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
-Date: Sun, 11 Aug 2019 22:38:57 +0200
-Subject: [PATCH] arm: dts: sync dts for Allwinner H6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Sync Kernel DTS for Allwinner H6 boards.
-
-Drop /omit-if-no-ref/ keyword as it's not supported by U-boot.
-
-commit <d45331b00ddb> Linux 5.3-rc4
-
-Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++
- arch/arm/dts/sun50i-h6-pine-h64.dts    | 12 ++++
- arch/arm/dts/sun50i-h6.dtsi            | 46 +++++++++++++++-
- 3 files changed, 131 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
-index 54b0882bed..0dc33c90dd 100644
--- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts
-+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
-@@ -14,6 +14,7 @@
- 	compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
- 
- 	aliases {
-+		ethernet0 = &emac;
- 		serial0 = &uart0;
- 	};
- 
-@@ -21,6 +22,17 @@
- 		stdout-path = "serial0:115200n8";
- 	};
- 
-+	connector {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
-@@ -41,6 +53,40 @@
- 	};
- };
- 
-+&de {
-+	status = "okay";
-+};
-+
-+&ehci0 {
-+	status = "okay";
-+};
-+
-+&emac {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ext_rgmii_pins>;
-+	phy-mode = "rgmii";
-+	phy-handle = <&ext_rgmii_phy>;
-+	phy-supply = <&reg_aldo2>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	status = "okay";
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&mdio {
-+	ext_rgmii_phy: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <1>;
-+	};
-+};
-+
- &mmc0 {
- 	vmmc-supply = <&reg_cldo1>;
- 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
-@@ -57,6 +103,15 @@
- 	status = "okay";
- };
- 
-+&ohci0 {
-+	status = "okay";
-+};
-+
-+&pio {
-+	vcc-pd-supply = <&reg_cldo1>;
-+	vcc-pg-supply = <&reg_aldo1>;
-+};
-+
- &r_i2c {
- 	status = "okay";
- 
-@@ -177,8 +232,29 @@
- 	};
- };
- 
-+&r_pio {
-+	/*
-+	 * PL0 and PL1 are used for PMIC I2C
-+	 * don't enable the pl-supply else
-+	 * it will fail at boot
-+	 *
-+	 * vcc-pl-supply = <&reg_aldo1>;
-+	 */
-+	vcc-pm-supply = <&reg_aldo1>;
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_ph_pins>;
- 	status = "okay";
- };
-+
-+&usb2otg {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
-+&usb2phy {
-+	usb0_vbus-supply = <&reg_vcc5v>;
-+	status = "okay";
-+};
-diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
-index 4802902e12..1898345183 100644
--- a/arch/arm/dts/sun50i-h6-pine-h64.dts
-+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
-@@ -127,6 +127,12 @@
- 	status = "okay";
- };
- 
-+&pio {
-+	vcc-pc-supply = <&reg_bldo2>;
-+	vcc-pd-supply = <&reg_cldo1>;
-+	vcc-pg-supply = <&reg_aldo1>;
-+};
-+
- &r_i2c {
- 	status = "okay";
- 
-@@ -243,10 +249,16 @@
- 	pcf8563: rtc@51 {
- 		compatible = "nxp,pcf8563";
- 		reg = <0x51>;
-+		interrupt-parent = <&r_intc>;
-+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
- 		#clock-cells = <0>;
- 	};
- };
- 
-+&r_pio {
-+	vcc-pm-supply = <&reg_aldo1>;
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_ph_pins>;
-diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi
-index e0dc4a05c1..a117f479ae 100644
--- a/arch/arm/dts/sun50i-h6.dtsi
-+++ b/arch/arm/dts/sun50i-h6.dtsi
-@@ -101,7 +101,7 @@
- 		#size-cells = <1>;
- 		ranges;
- 
-		display-engine@1000000 {
-+		bus@1000000 {
- 			compatible = "allwinner,sun50i-h6-de3",
- 				     "allwinner,sun50i-a64-de2";
- 			reg = <0x1000000 0x400000>;
-@@ -203,11 +203,32 @@
- 			#reset-cells = <1>;
- 		};
- 
-+		dma: dma-controller@3002000 {
-+			compatible = "allwinner,sun50i-h6-dma";
-+			reg = <0x03002000 0x1000>;
-+			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>;
-+			clock-names = "bus", "mbus";
-+			dma-channels = <16>;
-+			dma-requests = <46>;
-+			resets = <&ccu RST_BUS_DMA>;
-+			#dma-cells = <1>;
-+		};
-+
- 		sid: sid@3006000 {
- 			compatible = "allwinner,sun50i-h6-sid";
- 			reg = <0x03006000 0x400>;
- 		};
- 
-+		watchdog: watchdog@30090a0 {
-+			compatible = "allwinner,sun50i-h6-wdt",
-+				     "allwinner,sun6i-a31-wdt";
-+			reg = <0x030090a0 0x20>;
-+			interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
-+			/* Broken on some H6 boards */
-+			status = "disabled";
-+		};
-+
- 		pio: pinctrl@300b000 {
- 			compatible = "allwinner,sun50i-h6-pinctrl";
- 			reg = <0x0300b000 0x400>;
-@@ -243,6 +264,18 @@
- 				bias-pull-up;
- 			};
- 
-+			/*
-+			 * /omit-if-no-ref/ isn't supported by U-boot
-+			 * keep this comment to avoid bad sync with Linux
-+			 */
-+			mmc1_pins: mmc1-pins {
-+				pins = "PG0", "PG1", "PG2", "PG3",
-+				       "PG4", "PG5";
-+				function = "mmc1";
-+				drive-strength = <30>;
-+				bias-pull-up;
-+			};
-+
- 			mmc2_pins: mmc2-pins {
- 				pins = "PC1", "PC4", "PC5", "PC6",
- 				       "PC7", "PC8", "PC9", "PC10",
-@@ -294,6 +327,8 @@
- 			resets = <&ccu RST_BUS_MMC1>;
- 			reset-names = "ahb";
- 			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&mmc1_pins>;
- 			status = "disabled";
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -445,7 +480,6 @@
- 			resets = <&ccu RST_BUS_OHCI3>,
- 				 <&ccu RST_BUS_EHCI3>;
- 			phys = <&usb2phy 3>;
-			phy-names = "usb";
- 			status = "disabled";
- 		};
- 
-@@ -457,7 +491,6 @@
- 				 <&ccu CLK_USB_OHCI3>;
- 			resets = <&ccu RST_BUS_OHCI3>;
- 			phys = <&usb2phy 3>;
-			phy-names = "usb";
- 			status = "disabled";
- 		};
- 
-@@ -613,6 +646,13 @@
- 			#reset-cells = <1>;
- 		};
- 
-+		r_watchdog: watchdog@7020400 {
-+			compatible = "allwinner,sun50i-h6-wdt",
-+				     "allwinner,sun6i-a31-wdt";
-+			reg = <0x07020400 0x20>;
-+			interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-+		};
-+
- 		r_intc: interrupt-controller@7021000 {
- 			compatible = "allwinner,sun50i-h6-r-intc",
- 				     "allwinner,sun6i-a31-r-intc";
-- 
-2.20.1
-
--- a/board/beelink/gs1/post-build.sh
+++ b/board/beelink/gs1/post-build.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf
--- 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/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json
+++ b/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json
@@ -4,7 +4,7 @@
  "pbuffers": true,
  "outputs": [
    {
-      "name": "LVDS1",
+      "name": "LVDS-1",
      "mode": "1280x800"
    }
  ]
--- a/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json
+++ b/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json
@@ -4,7 +4,7 @@
  "pbuffers": true,
  "outputs": [
    {
-      "name": "LVDS1",
+      "name": "LVDS-1",
      "mode": "1280x480"
    }
  ]
--- a/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json
+++ b/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json
@@ -4,7 +4,7 @@
  "pbuffers": true,
  "outputs": [
    {
-      "name": "LVDS1",
+      "name": "LVDS-1",
      "mode": "800x480"
    }
  ]
--- a/board/freescale/common/imx/imx8-bootloader-prepare.sh
+++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh
@@ -10,14 +10,14 @@ 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
+		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.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

@@ -27,11 +27,8 @@ main ()
 		cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin
 		cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin
 		dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128
-		if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
-			${HOST_DIR}/bin/mkimage_imx8 -soc QM -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qm-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a53 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-		else
-			${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
-		fi
+
+		${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 	fi

 	exit $?
--- a/board/freescale/common/imx/post-image.sh
+++ b/board/freescale/common/imx/post-image.sh
@@ -32,9 +32,7 @@ linux_image()

 genimage_type()
 {
-	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then
-		echo "genimage.cfg.template_imx8"
-	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
+	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"
--- a/board/freescale/imx6-sabresd/linux_qt5.fragment
+++ b/board/freescale/imx6-sabresd/linux_qt5.fragment
@@ -2,3 +2,4 @@
 # ondemand governor with a mainline kernel.
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_VIDEO_CODA=m
--- a/board/freescale/imx6-sabresd/readme.txt
+++ b/board/freescale/imx6-sabresd/readme.txt
@@ -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/friendlyarm/nanopi-neo-plus2/extlinux.conf
+++ b/board/friendlyarm/nanopi-neo-plus2/extlinux.conf
@@ -1,4 +0,0 @@
-label linux
-  kernel /Image
-  devicetree /sun50i-h5-nanopi-neo-plus2.dtb
-  append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
--- 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",
-			"extlinux"
-		}
-	}
-	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/post-build.sh
+++ b/board/friendlyarm/nanopi-neo-plus2/post-build.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf
--- 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/friendlyarm/nanopi-neo/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo/genimage.cfg
@@ -29,5 +29,6 @@ image sdcard.img {
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext4"
+		size = 32M
 	}
 }
--- a/board/friendlyarm/nanopi-neo/post-build.sh
+++ b/board/friendlyarm/nanopi-neo/post-build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# post-build.sh for Nanopi NEO, based on the Orange Pi PC
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+# 2016, "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+BOARD_DIR="$( dirname "${0}" )"
+MKIMAGE="${HOST_DIR}/bin/mkimage"
+BOOT_CMD="${BOARD_DIR}/boot.cmd"
+BOOT_CMD_H="${BINARIES_DIR}/boot.scr"
+
+# U-Boot script
+"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}"
--- a/board/friendlyarm/nanopi-neo/post-image.sh
+++ b/board/friendlyarm/nanopi-neo/post-image.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# post-image.sh for Nanopi NEO, based on the Orange Pi PC
+
+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/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/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/pc/genimage-efi.cfg
+++ b/board/pc/genimage-efi.cfg
@@ -1,35 +0,0 @@
-image efi-part.vfat {
-  vfat {
-    file startup.nsh {
-      image = "efi-part/startup.nsh"
-    }
-    file EFI {
-      image = "efi-part/EFI"
-    }
-    file bzImage {
-      image = "bzImage"
-    }
-  }
-  size = 16777216
-}
-
-image disk.img {
-  hdimage {
-    gpt = true
-  }
-
-  partition boot {
-    image = "efi-part.vfat"
-    partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
-    offset = 32768
-    size = 16777216
-    bootable = true
-  }
-
-  partition root {
-    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
-    partition-uuid = UUID_TMP
-    image = "rootfs.ext2"
-    offset = 16809984
-  }
-}
--- a/board/pc/grub-efi.cfg
+++ b/board/pc/grub-efi.cfg
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
- linux /bzImage root=PARTUUID=UUID_TMP rootwait console=tty1
-}
--- a/board/pc/post-build.sh
+++ b/board/pc/post-build.sh
@@ -4,12 +4,7 @@ set -e

 BOARD_DIR=$(dirname "$0")

-# Detect boot strategy, EFI or BIOS
-if [ -f "$BINARIES_DIR/efi-part/startup.nsh" ]; then
-    cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg"
-else
-    cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"
+cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg"

-    # Copy grub 1st stage to binaries, required for genimage
-    cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"
-fi
+# Copy grub 1st stage to binaries, required for genimage
+cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"
--- a/board/pc/post-image-efi-gpt.sh
+++ b/board/pc/post-image-efi-gpt.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+cd ${BINARIES_DIR}
+
+# GPT partition type UUIDs
+esp_type=c12a7328-f81f-11d2-ba4b-00a0c93ec93b
+linux_type=44479540-f297-41b2-9af7-d131d5f0458a
+
+# Partition UUIDs
+efi_part_uuid=$(uuidgen)
+root_part_uuid=$(uuidgen)
+
+# Boot partition offset and size, in 512-byte sectors
+efi_part_start=64
+efi_part_size=32768
+
+# Rootfs partition offset and size, in 512-byte sectors
+root_part_start=$(( efi_part_start + efi_part_size ))
+root_part_size=$(( $(stat -c %s rootfs.ext2) / 512 ))
+
+first_lba=34
+last_lba=$(( root_part_start + root_part_size ))
+
+# Disk image size in 512-byte sectors
+image_size=$(( last_lba + first_lba ))
+
+cat > efi-part/EFI/BOOT/grub.cfg <<EOF
+set default="0"
+set timeout="5"
+
+menuentry "Buildroot" {
+	linux /bzImage root=PARTUUID=$root_part_uuid rootwait console=tty1
+}
+EOF
+
+# Create EFI system partition
+rm -f efi-part.vfat
+dd if=/dev/zero of=efi-part.vfat bs=512 count=0 seek=$efi_part_size
+mkdosfs  efi-part.vfat
+mcopy -bsp -i efi-part.vfat efi-part/startup.nsh ::startup.nsh
+mcopy -bsp -i efi-part.vfat efi-part/EFI ::EFI
+mcopy -bsp -i efi-part.vfat bzImage ::bzImage
+
+rm -f disk.img
+dd if=/dev/zero of=disk.img bs=512 count=0 seek=$image_size
+
+sfdisk disk.img <<EOF
+label: gpt
+label-id: $(uuidgen)
+device: /dev/foobar0
+unit: sectors
+first-lba: $first_lba
+last-lba: $last_lba
+
+/dev/foobar0p1 : start=$efi_part_start,  size=$efi_part_size,  type=$esp_type,   uuid=$efi_part_uuid,  name="efi-part.vfat"
+/dev/foobar0p2 : start=$root_part_start, size=$root_part_size, type=$linux_type, uuid=$root_part_uuid, name="rootfs.ext2"
+EOF
+
+dd if=efi-part.vfat of=disk.img bs=512 count=$efi_part_size seek=$efi_part_start conv=notrunc
+dd if=rootfs.ext2   of=disk.img bs=512 count=$root_part_size seek=$root_part_start conv=notrunc
--- a/board/pc/post-image-efi.sh
+++ b/board/pc/post-image-efi.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-UUID=$(dumpe2fs "$BINARIES_DIR/rootfs.ext2" 2>/dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p')
-sed -i "s/UUID_TMP/$UUID/g" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg"
-sed "s/UUID_TMP/$UUID/g" board/pc/genimage-efi.cfg > "$BINARIES_DIR/genimage-efi.cfg"
-support/scripts/genimage.sh -c "$BINARIES_DIR/genimage-efi.cfg"
--- 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/x86/post-build.sh
+++ b/board/qemu/x86/post-build.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-
-# Add a console on tty1
-if [ -e ${TARGET_DIR}/etc/inittab ]; then
-    grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
-	sed -i '/GENERIC_SERIAL/a\
-tty1::respawn:/sbin/getty -L  tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab
-fi
--- a/board/qemu/x86/readme.txt
+++ b/board/qemu/x86/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user

 Optionally add -smp N to emulate a SMP system with N CPUs.

--- a/board/qemu/x86_64/post-build.sh
+++ b/board/qemu/x86_64/post-build.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -u
-set -e
-
-# Add a console on tty1
-if [ -e ${TARGET_DIR}/etc/inittab ]; then
-    grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
-	sed -i '/GENERIC_SERIAL/a\
-tty1::respawn:/sbin/getty -L  tty1 0 vt100 # QEMU graphical window' ${TARGET_DIR}/etc/inittab
-fi
--- a/board/qemu/x86_64/readme.txt
+++ b/board/qemu/x86_64/readme.txt
@@ -1,6 +1,6 @@
 Run the emulation with:

-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda console=tty1 console=ttyS0" -serial stdio -net nic,model=virtio -net user
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda" -net nic,model=virtio -net user

 Optionally add -smp N to emulate a SMP system with N CPUs.

--- 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-64.cfg
+++ b/board/raspberrypi/genimage-raspberrypi4-64.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",
-      "Image"
-    }
-  }
-  size = 32M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext4"
-  }
-}
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -10,13 +10,13 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 for arg in "$@"
 do
 	case "${arg}" in
-		--add-miniuart-bt-overlay)
+		--add-pi3-miniuart-bt-overlay)
 		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
+			echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
 			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"

-# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
-dtoverlay=miniuart-bt
+# fixes rpi3 ttyAMA0 serial console
+dtoverlay=pi3-miniuart-bt
 __EOF__
 		fi
 		;;
@@ -28,6 +28,15 @@ __EOF__

 # enable 64bits support
 arm_64bit=1
+__EOF__
+		fi
+
+		# Enable uart console
+		if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+
+# enable rpi3 ttyS0 serial console
+enable_uart=1
 __EOF__
 		fi
 		;;
@@ -40,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
@@ -78,7 +78,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 miniuart-bt is needed
+[2] Only for the Raspberry Pi 3/4 Models (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-64
+++ b/board/raspberrypi4-64
@@ -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/solidrun/clearfog_gt_8k/linux-extras.config
+++ b/board/solidrun/clearfog_gt_8k/linux-extras.config
@@ -1,6 +1,4 @@
 CONFIG_MARVELL_PHY=y
 CONFIG_SFP=y
-CONFIG_IPV6=y
-CONFIG_BRIDGE=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MV88E6XXX=y
--- a/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg
+++ b/board/stmicroelectronics/stm32mp157c-dk2/genimage.cfg
@@ -1,24 +0,0 @@
-image sdcard.img {
-	hdimage {
-		gpt = "true"
-	}
-
-	partition fsbl1 {
-		image = "u-boot-spl.stm32"
-	}
-
-	partition fsbl2 {
-		image = "u-boot-spl.stm32"
-	}
-
-	partition ssbl {
-		image = "u-boot.img"
-	}
-
-	partition rootfs {
-		image = "rootfs.ext4"
-		partition-type = 0x83
-		bootable = "yes"
-		size = 256M
-	}
-}
--- a/board/stmicroelectronics/stm32mp157c-dk2/linux.config
+++ b/board/stmicroelectronics/stm32mp157c-dk2/linux.config
@@ -1,182 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_USELIB=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_ARCH_STM32=y
-CONFIG_ARM_THUMBEE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_754327=y
-CONFIG_ARM_ERRATA_764369=y
-CONFIG_ARM_ERRATA_775420=y
-CONFIG_ARM_ERRATA_798181=y
-CONFIG_SMP=y
-CONFIG_MCPM=y
-CONFIG_HIGHMEM=y
-CONFIG_FORCE_MAX_ZONEORDER=12
-CONFIG_SECCOMP=y
-# CONFIG_ATAGS is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_ARM_CRYPTO=y
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_CMDLINE_PARTITION=y
-CONFIG_CMA=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_CAN=y
-CONFIG_CAN_M_CAN=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=128
-CONFIG_SIMPLE_PM_BUS=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_STM32_FMC2=y
-CONFIG_MTD_SPI_NOR=y
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_SRAM=y
-CONFIG_EEPROM_AT24=y
-CONFIG_NETDEVICES=y
-CONFIG_VIRTIO_NET=y
-CONFIG_KS8851=y
-CONFIG_SMSC911X=y
-CONFIG_STMMAC_ETH=y
-CONFIG_DWMAC_DWC_QOS_ETH=y
-CONFIG_MDIO_BITBANG=y
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EDT_FT5X06=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_STPMIC1_ONKEY=y
-CONFIG_SERIAL_STM32=y
-CONFIG_SERIAL_STM32_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_STM32F7=y
-CONFIG_SPI=y
-CONFIG_SPI_STM32=y
-CONFIG_SPI_STM32_QSPI=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_PINCTRL_STMFX=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_SYSCON_REBOOT_MODE=y
-CONFIG_WATCHDOG=y
-CONFIG_STPMIC1_WATCHDOG=y
-CONFIG_MFD_STM32_LPTIMER=y
-CONFIG_MFD_STPMIC1=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_STM32_VREFBUF=y
-CONFIG_REGULATOR_STM32_PWR=y
-CONFIG_REGULATOR_STPMIC1=y
-CONFIG_DRM=y
-CONFIG_DRM_STM=y
-CONFIG_DRM_STM_DSI=y
-CONFIG_DRM_PANEL_ORISETECH_OTM8009A=y
-CONFIG_DRM_SII902X=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_USB=y
-CONFIG_USB_OTG=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_ISP1760=y
-CONFIG_USB_HSIC_USB3503=y
-CONFIG_USB_GPIO_VBUS=y
-CONFIG_USB_ISP1301=y
-CONFIG_USB_ULPI=y
-CONFIG_TYPEC=y
-CONFIG_TYPEC_STUSB=y
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK_MINORS=16
-CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_DW=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_STM32=y
-CONFIG_DMADEVICES=y
-CONFIG_STM32_DMA=y
-CONFIG_STM32_DMAMUX=y
-CONFIG_STM32_MDMA=y
-CONFIG_HWSPINLOCK=y
-CONFIG_HWSPINLOCK_STM32=y
-CONFIG_STM32_IPCC=y
-CONFIG_REMOTEPROC=y
-CONFIG_STM32_RPROC=y
-CONFIG_RPMSG_VIRTIO=y
-CONFIG_RPMSG_TTY=y
-CONFIG_IIO=y
-CONFIG_IIO_SW_TRIGGER=y
-CONFIG_SD_ADC_MODULATOR=y
-CONFIG_STM32_ADC_CORE=y
-CONFIG_STM32_ADC=y
-CONFIG_STM32_ADC_TEMP=y
-CONFIG_STM32_DFSDM_ADC=y
-CONFIG_STM32_LPTIMER_CNT=y
-CONFIG_STM32_DAC=y
-CONFIG_IIO_HRTIMER_TRIGGER=y
-CONFIG_IIO_STM32_LPTIMER_TRIGGER=y
-CONFIG_PWM=y
-CONFIG_PWM_STM32=y
-CONFIG_PWM_STM32_LP=y
-CONFIG_PHY_STM32_USBPHYC=y
-CONFIG_NVMEM_STM32_ROMEM=y
-CONFIG_EXT4_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_PRINTK_TIME=y
--- a/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf
+++ b/board/stmicroelectronics/stm32mp157c-dk2/overlay/boot/extlinux/extlinux.conf
@@ -1,4 +0,0 @@
-label stm32mp157c-dk2-buildroot
-  kernel /boot/zImage
-  devicetree /boot/stm32mp157c-dk2.dtb
-  append root=/dev/mmcblk0p4 rootwait
--- a/board/stmicroelectronics/stm32mp157c-dk2/readme.txt
+++ b/board/stmicroelectronics/stm32mp157c-dk2/readme.txt
@@ -1,38 +0,0 @@
-STM32MP157C Discovery Kit v2
-
-Intro
-=====
-
-This configuration supports the STM32MP157C Discovery Kit 2 (DK2)
-platform:
-
-  https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html
-
-How to build
-============
-
- $ make stm32mp157c_dk2_defconfig
- $ make
-
-How to write the microSD 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 microSD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-
-Boot the board
-==============
-
- (1) Insert the microSD card in connector CN15
-
- (2) Plug a micro-USB cable in connector CN11 and run your serial
-     communication program on /dev/ttyACM0.
-
- (3) Plug a USB-C cable in CN6 to power-up the board.
-
- (4) The system will start, with the console on UART, but also visible
-     on the screen.
--- a/board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config
+++ b/board/stmicroelectronics/stm32mp157c-dk2/uboot-fragment.config
@@ -1 +0,0 @@
-# CONFIG_STM32MP_WATCHDOG is not set
--- a/board/wandboard/post-image.sh
+++ b/board/wandboard/post-image.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+BOARD_DIR="$(dirname $0)"
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+  --rootpath "${TARGET_DIR}" \
+  --tmppath "${GENIMAGE_TMP}" \
+  --inputpath "${BINARIES_DIR}" \
+  --outputpath "${BINARIES_DIR}" \
+  --config "${GENIMAGE_CFG}"
+
--- a/boot/Config.in
+++ b/boot/Config.in
@@ -15,6 +15,7 @@ source "boot/mv-ddr-marvell/Config.in"
 source "boot/mxs-bootlets/Config.in"
 source "boot/optee-os/Config.in"
 source "boot/opensbi/Config.in"
+source "boot/riscv-pk/Config.in"
 source "boot/s500-bootloader/Config.in"
 source "boot/shim/Config.in"
 source "boot/syslinux/Config.in"
--- a/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch
+++ b/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch
@@ -0,0 +1,61 @@
+From 0d581abe6620ac69adec321b94390e009802f36a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 13 Mar 2016 14:32:33 +0100
+Subject: [PATCH] Use ld instead of gcc for linking
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ce40314..271bb4f 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,6 +1,7 @@
+ CROSS_COMPILE ?= arm-none-eabi-
+ 
+ CC = $(CROSS_COMPILE)gcc
+LD = $(CROSS_COMPILE)ld
+ OBJCOPY = $(CROSS_COMPILE)objcopy
+ OBJDUMP = $(CROSS_COMPILE)objdump
+ SIZE = $(CROSS_COMPILE)size
+@@ -10,7 +11,7 @@ OPENOCD = openocd
+ CFLAGS := -mthumb -mcpu=cortex-m4
+ CFLAGS += -ffunction-sections -fdata-sections
+ CFLAGS += -Os -std=gnu99 -Wall
+-LDFLAGS := -nostartfiles -Wl,--gc-sections
+LINKERFLAGS := -nostartfiles --gc-sections
+ 
+ obj-y += gpio.o mpu.o
+ obj-f4 += $(obj-y) usart-f4.o
+@@ -22,22 +23,22 @@ all: stm32f429i-disco stm32429i-eval stm32f469i-disco stm32746g-eval
+ 	$(CC) -c $(CFLAGS) $< -o $@
+ 
+ stm32f429i-disco: stm32f429i-disco.o $(obj-f4)
+-	$(CC) -T stm32f429.lds $(LDFLAGS) -o stm32f429i-disco.elf stm32f429i-disco.o $(obj-f4)
+	$(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32f429i-disco.elf stm32f429i-disco.o $(obj-f4)
+ 	$(OBJCOPY) -Obinary stm32f429i-disco.elf stm32f429i-disco.bin
+ 	$(SIZE) stm32f429i-disco.elf
+ 
+ stm32429i-eval: stm32429i-eval.o $(obj-f4)
+-	$(CC) -T stm32f429.lds $(LDFLAGS) -o stm32429i-eval.elf stm32429i-eval.o $(obj-f4)
+	$(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32429i-eval.elf stm32429i-eval.o $(obj-f4)
+ 	$(OBJCOPY) -Obinary stm32429i-eval.elf stm32429i-eval.bin
+ 	$(SIZE) stm32429i-eval.elf
+ 
+ stm32f469i-disco: stm32f469i-disco.o $(obj-f4)
+-	$(CC) -T stm32f429.lds $(LDFLAGS) -o stm32f469i-disco.elf stm32f469i-disco.o $(obj-f4)
+	$(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32f469i-disco.elf stm32f469i-disco.o $(obj-f4)
+ 	$(OBJCOPY) -Obinary stm32f469i-disco.elf stm32f469i-disco.bin
+ 	$(SIZE) stm32f469i-disco.elf
+ 
+ stm32746g-eval: stm32746g-eval.o $(obj-f7)
+-	$(CC) -T stm32f429.lds $(LDFLAGS) -o stm32746g-eval.elf stm32746g-eval.o $(obj-f7)
+	$(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32746g-eval.elf stm32746g-eval.o $(obj-f7)
+ 	$(OBJCOPY) -Obinary stm32746g-eval.elf stm32746g-eval.bin
+ 	$(SIZE) stm32746g-eval.elf
+ 
+-- 
+2.6.4
+
--- a/boot/afboot-stm32/afboot-stm32.hash
+++ b/boot/afboot-stm32/afboot-stm32.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 9b37b661bd3091ceb5d8dc5a56a2dfc02ae9ebc0c63dad3c4289c9d6b3d3ec89  afboot-stm32-0.2.tar.gz
+sha256 dbd715c8b99f7d266f74a04707a4dac76b75b31321f24dee5256a6348260530c  afboot-stm32-0.1.tar.gz
--- a/boot/afboot-stm32/afboot-stm32.mk
+++ b/boot/afboot-stm32/afboot-stm32.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-AFBOOT_STM32_VERSION = 0.2
+AFBOOT_STM32_VERSION = 0.1
 AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,v$(AFBOOT_STM32_VERSION))
 AFBOOT_STM32_INSTALL_IMAGES = YES
 AFBOOT_STM32_INSTALL_TARGET = NO
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -124,24 +124,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
 	  gets built before ATF, and that the appropriate BL33
 	  variable pointing to u-boot.bin is passed when building ATF.

-if BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
-
-config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE
-	string "U-Boot BL33 image name"
-	default "u-boot.bin"
-	help
-	  Name of the U-Boot BL33 image to include in ATF, it must
-	  have been installed to BINARIES_DIR by the U-Boot package.
-
-endif
-
-config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS
-	string "Additional ATF make targets"
-	help
-	  Additional targets for the ATF build
-	  E.G. When using the QorIQ custom ATF repository from NXP,
-	  the target 'pbl' can be used to build the pbl binary.
-
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES
 	string "Additional ATF build variables"
 	help
@@ -153,11 +135,4 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG
 	help
 	  Enable this option to build ATF with DEBUG=1.

-config BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES
-	string "Binary boot images"
-	default "*.bin"
-	help
-	  Names of generated image files that are installed in the
-	  output images/ directory.
-
 endif
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -70,8 +70,7 @@ endif
 endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE

 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y)
-ARM_TRUSTED_FIRMWARE_UBOOT_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE))
-ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_UBOOT_BIN)
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin
 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
 endif

@@ -139,9 +138,6 @@ define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF
 endef
 endif

-ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
-	$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS))
-
 define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
 	$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
@@ -150,9 +146,7 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
 endef

 define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS
-	$(foreach f,$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES)), \
-		cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(f) $(BINARIES_DIR)/
-	)
+	cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/
 	$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL)
 	$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF)
 endef
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -19,7 +19,7 @@ choice
 	prompt "AT91 Bootstrap 3 version"

 config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
-	bool "3.9.0"
+	bool "3.8.13"

 config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
 	bool "Custom Git repository"
@@ -27,15 +27,8 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
 	  This option allows Buildroot to get the AT91 Bootstrap 3
 	  source code from a Git repository.

-config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL
-	bool "Custom tarball"
-
 endchoice

-config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION
-	string "URL of custom AT91Bootstrap tarball"
-	depends on BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL
-
 if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT

 config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL
@@ -51,10 +44,9 @@ endif

 config BR2_TARGET_AT91BOOTSTRAP3_VERSION
 	string
-	default "v3.9.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
+	default "v3.8.13" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
 	default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \
 		if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
-	default "custom"	if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL

 config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR
 	string "custom patch dir"
--- a/boot/at91bootstrap3/at91bootstrap3.hash
+++ b/boot/at91bootstrap3/at91bootstrap3.hash
@@ -1,3 +1,2 @@
 # Locally calculated
-sha256	e23e6df23b79ca81e412cb73a1f48bd95df8d46c7d52a1d073c2ed9d4f3a1a71  at91bootstrap3-v3.9.0.tar.gz
-sha256  732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e  main.c
+sha256	a5a10579598d47475696fab56c086225b0f4b710299e2dc9e0f9b6f72ed98be8  at91bootstrap3-v3.8.13.tar.gz
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -6,12 +6,7 @@

 AT91BOOTSTRAP3_VERSION = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_VERSION))

-ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL),y)
-AT91BOOTSTRAP3_TARBALL = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION))
-AT91BOOTSTRAP3_SITE = $(patsubst %/,%,$(dir $(AT91BOOTSTRAP3_TARBALL)))
-AT91BOOTSTRAP3_SOURCE = $(notdir $(AT91BOOTSTRAP3_TARBALL))
-BR_NO_CHECK_HASH_FOR += $(AT91BOOTSTRAP3_SOURCE)
-else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y)
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y)
 AT91BOOTSTRAP3_SITE = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL))
 AT91BOOTSTRAP3_SITE_METHOD = git
 BR_NO_CHECK_HASH_FOR += $(AT91BOOTSTRAP3_SOURCE)
@@ -20,9 +15,7 @@ AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VER
 endif

 AT91BOOTSTRAP3_LICENSE = Atmel License
-ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y)
 AT91BOOTSTRAP3_LICENSE_FILES = main.c
-endif

 AT91BOOTSTRAP3_INSTALL_IMAGES = YES
 AT91BOOTSTRAP3_INSTALL_TARGET = NO
@@ -85,12 +78,6 @@ $(error No custom at91bootstrap3 repository version specified. Check your BR2_TA
 endif
 endif

-ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL),y)
-ifeq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION)),)
-$(error No custom AT91Bootstrap3 tarball specified. Check your BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION setting)
-endif # qstrip BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION
-endif # BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL
-
 endif # BR_BUILDING

 $(eval $(kconfig-package))
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2020.01.0"
+	bool "2019.07.0"

 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2020.01.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2019.07.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@@ -1,8 +1,5 @@
-# From https://www.barebox.org/download/barebox-2020.01.0.tar.bz2.md5
-md5  05038e0b61b68ce40e038295b809c548  barebox-2020.01.0.tar.bz2
+# From https://www.barebox.org/download/barebox-2019.07.0.tar.bz2.md5
+md5 8fb8e8ec3775228c34f7de2096872f51 barebox-2019.07.0.tar.bz2

 # Locally calculated
-sha256  8968e6b0d72d79eba636917b067b925e3bbb54d38c6c2acfc4e1e49909b42f33  barebox-2020.01.0.tar.bz2
-
-# License files, locally computed
-sha256  ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4  COPYING
+sha256 8512ac1b91ef48f8b657fad446edc868eb7da30e93d6ff7854f0006854b6a3a6 barebox-2019.07.0.tar.bz2
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -33,9 +33,7 @@ endif

 $(1)_DEPENDENCIES = host-lzop
 $(1)_LICENSE = GPL-2.0 with exceptions
-ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
 $(1)_LICENSE_FILES = COPYING
-endif

 $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))

--- a/boot/binaries-marvell/Config.in
+++ b/boot/binaries-marvell/Config.in
@@ -7,6 +7,26 @@ config BR2_TARGET_BINARIES_MARVELL
 	  reset and system control. ATF Boot Loader stage 2 (BL2) loads
 	  optional SCP_BL2 image into a platform-specific region
 	  of secure memory. This package downloads and installs such
-	  firmware, which is needed to build ATF.
+	  firmwares, which are needed to build ATF.

 	  https://github.com/MarvellEmbeddedProcessors/binaries-marvell/
+
+if BR2_TARGET_BINARIES_MARVELL
+
+choice
+	prompt "Marvell Armada platform"
+
+config BR2_TARGET_BINARIES_MARVELL_7040
+	bool "7040"
+
+config BR2_TARGET_BINARIES_MARVELL_8040
+	bool "8040"
+
+endchoice
+
+config BR2_TARGET_BINARIES_MARVELL_IMAGE
+	string
+	default "mrvl_scp_bl2_mss_ap_cp1_a8040.img" if BR2_TARGET_BINARIES_MARVELL_8040
+	default "mrvl_scp_bl2_mss_ap_cp1_a7040.img" if BR2_TARGET_BINARIES_MARVELL_7040
+
+endif
--- a/boot/binaries-marvell/binaries-marvell.hash
+++ b/boot/binaries-marvell/binaries-marvell.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz
-sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md
+sha256 45c348d7a62fd147e7c6a59211a77876ce5dd26de690bd45ab79c8ff891acedf binaries-marvell-14481806e699dcc6f7025dbe3e46cf26bb787791.tar.gz
+sha256 509a36bb6faa106bbc9730c23038a361ee0c860e53a4cdf9e8605c0174fe45f7	README.md
--- a/boot/binaries-marvell/binaries-marvell.mk
+++ b/boot/binaries-marvell/binaries-marvell.mk
@@ -4,17 +4,18 @@
 #
 ################################################################################

-# This is version binaries-marvell-armada-18.12
-BINARIES_MARVELL_VERSION = c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee
+# This is version binaries-marvell-armada-18.06
+BINARIES_MARVELL_VERSION = 14481806e699dcc6f7025dbe3e46cf26bb787791
 BINARIES_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,binaries-marvell,$(BINARIES_MARVELL_VERSION))

 BINARIES_MARVELL_LICENSE = GPL-2.0 with freertos-exception-2.0
 BINARIES_MARVELL_LICENSE_FILES = README.md

+BINARIES_MARVELL_IMAGE = $(call qstrip,$(BR2_TARGET_BINARIES_MARVELL_IMAGE))
 BINARIES_MARVELL_INSTALL_IMAGES  = YES

 define BINARIES_MARVELL_INSTALL_IMAGES_CMDS
-	$(INSTALL) -D -m 0644 $(@D)/mrvl_scp_bl2.img $(BINARIES_DIR)/scp-fw.bin
+	$(INSTALL) -D -m 0644 $(@D)/$(BINARIES_MARVELL_IMAGE) $(BINARIES_DIR)/scp-fw.bin
 endef

 $(eval $(generic-package))
--- a/boot/boot-wrapper-aarch64/Config.in
+++ b/boot/boot-wrapper-aarch64/Config.in
@@ -38,9 +38,4 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI
 	  Boot secondary SMP cores using PSCI firmware calls. If
 	  disabled, the spin-table method is used instead.

-config BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3
-	bool "Enable GICv3 instead of GICv2"
-	help
-	  Boot using GICv3 instead of GICv2.
-
 endif
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7
+BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
 BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
 BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause
 BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
@@ -15,11 +15,19 @@ BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
 # Makefile.
 BOOT_WRAPPER_AARCH64_AUTORECONF = YES

-BOOT_WRAPPER_AARCH64_DTB = $(LINUX_DIR)/arch/arm64/boot/dts/$(basename $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))).dtb
+BOOT_WRAPPER_AARCH64_DTB = /arch/arm64/boot/dts/$(basename $(call qstrip,$(BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS))).dtb
+
+# Fixup the path to the DTB in configure.ac. In the future, this
+# should hopefully be made more configurable by the
+# boot-wrapper-aarch64 developers.
+define BOOT_WRAPPER_AARCH64_FIX_DTB_NAME
+	$(SED) 's%^KERN_DTB=.*%KERN_DTB=$(BOOT_WRAPPER_AARCH64_DTB)%' $(@D)/configure.ac
+endef
+
+BOOT_WRAPPER_AARCH64_PRE_PATCH_HOOKS += BOOT_WRAPPER_AARCH64_FIX_DTB_NAME

 BOOT_WRAPPER_AARCH64_CONF_OPTS = \
 	--with-kernel-dir=$(LINUX_DIR) \
-	--with-dtb=$(BOOT_WRAPPER_AARCH64_DTB) \
 	--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)

 ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI),y)
@@ -28,10 +36,6 @@ else
 BOOT_WRAPPER_AARCH64_CONF_OPTS += --disable-psci
 endif

-ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_GICV3),y)
-BOOT_WRAPPER_AARCH64_CONF_OPTS += --enable-gicv3
-endif
-
 # We need to convince the configure script that the Linux kernel tree
 # exists, as well as the DTB and the kernel Image. Even though those
 # are available on the build machine, the configure script uses
--- a/boot/grub2/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch
+++ b/boot/grub2/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch
@@ -0,0 +1,74 @@
+From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Sat, 17 Feb 2018 06:47:28 -0800
+Subject: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
+
+Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
+
+https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
+
+x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
+32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32 as
+R_X86_64_PC32.
+
+Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+---
+ grub-core/efiemu/i386/loadcore64.c | 1 +
+ grub-core/kern/x86_64/dl.c         | 1 +
+ util/grub-mkimagexx.c              | 1 +
+ util/grub-module-verifier.c        | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
+index e49d0b6..18facf4 100644
+--- a/grub-core/efiemu/i386/loadcore64.c
+++ b/grub-core/efiemu/i386/loadcore64.c
+@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
+ 		    break;
+ 
+ 		  case R_X86_64_PC32:
+		  case R_X86_64_PLT32:
+ 		    err = grub_efiemu_write_value (addr,
+ 						   *addr32 + rel->r_addend
+ 						   + sym.off
+diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
+index 4406906..3a73e6e 100644
+--- a/grub-core/kern/x86_64/dl.c
+++ b/grub-core/kern/x86_64/dl.c
+@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
+ 	  break;
+ 
+ 	case R_X86_64_PC32:
+	case R_X86_64_PLT32:
+ 	  {
+ 	    grub_int64_t value;
+ 	    value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
+diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
+index a2bb054..39d7efb 100644
+--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
+@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
+ 		  break;
+ 
+ 		case R_X86_64_PC32:
+		case R_X86_64_PLT32:
+ 		  {
+ 		    grub_uint32_t *t32 = (grub_uint32_t *) target;
+ 		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
+index 9179285..a79271f 100644
+--- a/util/grub-module-verifier.c
+++ b/util/grub-module-verifier.c
+@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
+       -1
+     }, (int[]){
+       R_X86_64_PC32,
+      R_X86_64_PLT32,
+       -1
+     }
+   },
+-- 
+2.7.4
+
--- a/boot/grub2/grub2.hash
+++ b/boot/grub2/grub2.hash
@@ -1,3 +1,2 @@
 # Locally computed:
-sha256 e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d grub-2.04.tar.xz
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
+sha256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f grub-2.02.tar.xz
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-GRUB2_VERSION = 2.04
+GRUB2_VERSION = 2.02
 GRUB2_SITE = http://ftp.gnu.org/gnu/grub
 GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
 GRUB2_LICENSE = GPL-3.0+
--- a/boot/mv-ddr-marvell/mv-ddr-marvell.hash
+++ b/boot/mv-ddr-marvell/mv-ddr-marvell.hash
@@ -1,3 +1,2 @@
 # Locally calculated
-sha256  39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda  mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz
-sha256  69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78  ddr3_init.c
+sha256 9aaea1f5e8bf3c9d7e735f569d130b5c2ec773c43e0cfabc9b8dee32adbf7e4e mv-ddr-marvell-99d772547314f84921268d57e53d8769197d3e21.tar.gz
--- a/boot/mv-ddr-marvell/mv-ddr-marvell.mk
+++ b/boot/mv-ddr-marvell/mv-ddr-marvell.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################

-# This is the commit for mv_ddr-armada-18.12.0
-MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475
+# This is the commit for mv_ddr-armada-18.09.2
+MV_DDR_MARVELL_VERSION = 99d772547314f84921268d57e53d8769197d3e21
 MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION))
 MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial
 MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c
--- a/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch
+++ b/boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch
@@ -1,37 +0,0 @@
-From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Fri, 15 Feb 2019 14:57:41 -0800
-Subject: [PATCH] Makefile: Don't specify mabi or march
-
-To avoid
-    can't link double-float modules with soft-float modules
-errors when building 32-bit openSBI don't specify mabi or march.
-
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ae68f55..10851fc 100644
--- a/Makefile
-+++ b/Makefile
-@@ -145,7 +145,6 @@ GENFLAGS	+=	$(firmware-genflags-y)
- CFLAGS		=	-g -Wall -Werror -nostdlib -fno-strict-aliasing -O2
- CFLAGS		+=	-fno-omit-frame-pointer -fno-optimize-sibling-calls
- CFLAGS		+=	-mno-save-restore -mstrict-align
-CFLAGS		+=	-mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA)
- CFLAGS		+=	-mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
- CFLAGS		+=	$(GENFLAGS)
- CFLAGS		+=	$(platform-cflags-y)
-@@ -158,7 +157,6 @@ CPPFLAGS	+=	$(firmware-cppflags-y)
- ASFLAGS		=	-g -Wall -nostdlib -D__ASSEMBLY__
- ASFLAGS		+=	-fno-omit-frame-pointer -fno-optimize-sibling-calls
- ASFLAGS		+=	-mno-save-restore -mstrict-align
-ASFLAGS		+=	-mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA)
- ASFLAGS		+=	-mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
- ASFLAGS		+=	$(GENFLAGS)
- ASFLAGS		+=	$(platform-asflags-y)
-- 
-2.20.1
-
--- a/boot/opensbi/opensbi.hash
+++ b/boot/opensbi/opensbi.hash
@@ -1,3 +1,2 @@
 # locally computed
-sha256 bc82f1e63663cafb7976b324d8a01263510cfd816063dc89e0ccffb9763fb1dd opensbi-0.5.tar.gz
-sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD
+sha256 d3060bf51af00204ce90fc73106955c694463b59a5b81be64cf780cd32743abf opensbi-0.4.tar.gz
--- a/Show More
+++ b/Show More