Update for 2021.05.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/ruby: fix RUBY_VERSION_EXT
2021-08-10 09:32:54 +02:00 · 2021-08-09 22:14:42 +02:00 · 2021-08-08 22:50:28 +02:00 · 2021-08-08 22:49:08 +02:00 · 2021-08-08 22:49:05 +02:00 · 2021-08-08 21:46:59 +02:00
1923 changed files with 18274 additions and 23579 deletions
@@ -1,7 +1,7 @@
 # Configuration for Gitlab-CI.
 # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines

-image: $CI_REGISTRY/buildroot.org/buildroot/base:20211120.1925
+image: buildroot/base:20200814.2228

 stages:
  - generate-gitlab-ci
@@ -1,213 +1,3 @@
-2021.08.3, released December 13th, 2021
-
-	Important / security related fixes.
-
-	Defconfigs: Various fixes for building with gcc >= 10 host or
-	target compilers.
-
-	Updated/fixed packages: alsa-lib, apparmor, apr, asterisk,
-	binutils, bluez5_utils, coreutils, e2fsprogs, exfat,
-	freeswitch, gdb, glmark2, glog, glorytun, gmp,
-	gpu-amd-bin-mx51, gst1-interpipe, gstreamer1, guile, gupnp,
-	hackrf, heimdal, hiawatha, hplip, icu, imx-vpuwrap, isl,
-	janus-gateway, libatomic_ops, libbson, libdnet, libffi,
-	libgdiplus, libgee, libglib2, libhtp, libmodsecurity, libnspr,
-	libnss, libosmium, libunwind, linux, lynx, meson, micropython,
-	mkpasswd, mksh, mosquitto, motion, mupdf, mxml, netdata,
-	nfs-utils, opencv4, oracle-mysql, pcre, php, postgresql,
-	pure-ftpd, python-cycler, qdecoder, rcw-smarc-sal28, samba4,
-	smack, speex, stress-ng, suricata, syslinux, uboot, unixodbc,
-	unrar, vim, websocketpp, wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14346: BR2_PACKAGE_NFS_UTILS_RPC_NFSD does not patch CONFIG_NFSD..
-
-2021.08.2, released November 10th, 2021
-
-	Important / security related fixes.
-
-	Updated/fixed packages: asterisk, audit, bind, bitcoin,
-	containerd, cryptsetup, dahdi-linux, dbus-python, dfu-util,
-	docker-cli, docker-engine, earlyoom, edk2-platforms, exiv2,
-	ffmpeg, freerdp, gdb, gensio, gnupg2, go, gpsd,
-	gst1-plugins-bad, gst1-plugins-ugly, gst1-vaapi, gtest,
-	hiredis, lftp, libps1, libva, libva-utils, lightning,
-	log4cplus, lrzip, netdata, nodejs, olsr, openjdk, openjdk-bin,
-	pango, php, python3-cffi, qemu, refpolicy, rng-tools, samba4,
-	snort, strongswan, sunxi-mali-mainline-driver, suricata,
-	systemd, tor, vim, weston, wf111, wireguard-linux-compat,
-	xerces
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx)
-
-2021.08.1, released October 11, 2021
-
-	Important / security related fixes.
-
-	gdbinit: Mark the sysroot as a "safe path" before configuring
-	it, so pretty printers work correctly without having to pass
-	-ix to gdb
-
-	Updated/fixed packages: alsa-lib, apache,
-	arm-trusted-firmware, atftp, bind, botan, cog, containerd,
-	cryptopp, docker-cli, dash, dc3dd, docker-engine, dovecot,
-	environment-setup, erlang, fetchmail, ffmpeg, fio, gcc, gd,
-	gdb, ghostscript, gnuradio, gnutils, go,
-	gobject-introspection, google-breakpad, gst-omx,
-	gst1-devtools, gst1-interpipe, gst1-libav, gst1-plugins-bad,
-	gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly,
-	gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
-	gstreamer1-editing-services, gupnp, haproxy, imlib2, kodi,
-	kodi-pvr-octonet, kodi-visualisation-fishbmc, libcurl,
-	libexif, libgcrypt, libglib2, libkrb5, libressl, librsvg,
-	libsndfile, libssh, libvirt, libxcrypt, libyang, links, lvm2,
-	lynx, lxc, mc, mesa3d, micropython, minicom, mono, mosquitto,
-	mtr, mupdf, mv-ddr-marvell, net-tools, nginx-dav-ext, nmap,
-	nodejs, ntfs-3g, openjdk, openjdk-bin, openldap, openssh,
-	pcre2, php, php-gnupg, pipewire, postgis, python-aioconsole,
-	python-cbor2, python-cffi, python-cython, python-dateutil,
-	python-django, python-pillow, python-pip, python-texttable,
-	python-urllib3, python-webob, qemu, qt5location, redis,
-	refpolicy, ripgrep, ruby, runc, sispmctl, sox, squid,
-	strongswan, supervisor, swupdate, syslinux, systemd, tinycbor,
-	trace-cmd, uboot-tools, uclibc, udisks, uhd, vim, vsftpd,
-	wavemon, webkitgtk, wget, wireless-regdb, wpewebkit,
-	xapp_xrdb, xapp_xwd, xen, xlib_libXfont2, xlib_libXft,
-	xserver_xorg-server, zip
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14206: Kodi: even when not enabled, forcefully selects libevdev..
-	#14211: libffi-3.3.tar.gz repacked
-	#14221: mv-ddr-marvell fails license validation
-
-2021.08, released September 4th, 2021
-
-	Various fixes.
-
-	Updated/fixed packages: gstreamer1-mm, netsniff-ng, nginx,
-	openmpi, python-pyudev, python3, qt5base, wlroots, xvisor
-
-2021.08-rc3, released August 31st, 2021
-
-	Fixes all over the tree.
-
-	Toolchain: Disable fortify support for Microblaze as it is not
-	currently working.
-
-	Defconfigs: Acmesystems aria/ariette g25: Fix build issue
-	after at91bootstrap bump, BeagleV: Correct kernel headers
-	version, PC x86-64: Bump kernel to 4.19.204 to fix build issue
-	with GCC 10.x.
-
-	Updated/fixed packages: alsa-utils, at91bootstrap3, belle-sip,
-	bullet, c-ares, cjson, coreutils, cpio, eigen, fetchmail, gdb,
-	haproxy, heirloom-mailx, ipmiutil, kvm-unit-tests, libarchive,
-	libffi, libmodsecurity, libopenssl, libressl, libshout,
-	libvirt, linux-pam, lmbench, localedef, lua-lunix, mesa3d,
-	mpv, mtd, nodejs, nvidia-driver, openvmtools, php, polkit,
-	python-requests, python3-requests, rust-bin, rustc, samba4,
-	sdl2, snort3, ushare, xen
-
-	Removed packages: libmcrypt, mcrypt, sentry-cli
-
-2021.08-rc2, released August 18th, 2021
-
-	Fixes all over the tree.
-
-	Defconfigs: Acmesystems acqua a5: Bump at91bootstrap version
-	to fix build issue with binutils >= 2.35, Microchip sam9x60ek
-	mmc_dev: Add missing toolchain/system options, sama5d2-icp
-	mmc: Correct at91bootstrap options
-
-	Updated/fixed packages: arm-trusted-firmware, at91bootstrap3,
-	azure-iot-sdk-c, bluez5_utils, bullet, busybox, cegui, efl,
-	erlang, ffmpeg, flatbuffers, fontconfig, gcc, gd, glibc, go,
-	gobject-introspection, gpsd, guile, harfbuzz, iozone, iputils,
-	jszip, libargtable2, libbpf, libebml, libepoxy, libesmtp,
-	libfuse3, libgeos, libnss, libodb-boost, libodb-mysql,
-	libodb-pgsql, libqmi, libqrtr-glib, libuhttpd, libuwsc,
-	libvirt, ltp-testsuite, luaossl, mongodb, mpd, mupdf, mutt,
-	network-manager, nginx-naxsi, nodejs, ogre, openzwave,
-	optee-os, osm2pgsql, pdbg, perl-net-ssh2, php, pipewire,
-	pistache, pixman, poke, polkit, poppler, postgresql, postkit,
-	prelink-cross, prosody, protobuf, pulseview,
-	python-cryptography, python-keyring, python-matplotlib,
-	python-pymupdf, python-pyopenssl, python-secretstorage,
-	python-treq, python-txtorcon, python3, qemu, qpdf, qt5base,
-	refpolicy, ruby, rust-bin, s390-tools, sconeserver, seatd,
-	shairport-sync, sox, sqlite, sylpheed, sysdig, syslog-ng,
-	system-config-printer, tar, terminology, tor, tpm2-tools, uhd,
-	unbound, usbguard, wireshark, xen, xenomai, xlib_libxshmfence,
-	zstd
-
-	New packages: desktop-file-utils
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13586: grub failure with BR2_OPTIMIZE_3
-	#13671: openSSH server closes connection before authentication..
-
-2021.08-rc1, released August 3rd, 2021
-
-	Numerous package updates.
-
-	Toolchain:
-
-        - add support for gcc 11.x, gcc 10.x is now the default, gcc
-	  9.x updated to 9.4.0, removed gcc 8.x support except for
-	  PowerPC SPE
-
-	- add support for binutils 2.37, binutils 2.36.x is now the
-          default, binutils 2.34 removed.
-
-	- glibc updated to 2.33
-
-        - gdb enabled on NIOS II, gdbserver enabled on RISC-V.
-
-	Bootloaders/firmware: support for building the EDK II UEFI
-	firmware, support for building AT91Bootstrap 4.x.
-
-	New BR2_ENABLE_RUNTIME_DEBUG option, that controls whether
-	packages should be compiled with runtime debugging
-	information (which is different than debugging symbols).
-
-	Many features of the bluez5_utils package have been made
-	optional, and default to disabled. Users of bluez5_utils are
-	encouraged to review their configuration.
-
-	Many packages (over 70) updated to enable the appropriate
-	SELinux refpolicy module when SELinux support is enabled.
-
-	Many packages updated to select the appropriate OpenSSL
-	features after many OpenSSL ciphers/features have been made
-	optional.
-
-	New defconfigs: kontron_pitx_imx8m, microchip_sama5d2_icp,
-	qemu_aarch64_sbsa, raspberrypicm4io, raspberrypicm4io_64,
-	terasic_de10nano_cyclone5, uevm5432.
-
-	New packages: alsa-plugins, apg, bmap-tools, daq3, edk2,
-	edk2-platforms, gumbo-parser, libbpf, libosmium, libpsl,
-	libqb, libtalloc, libvirt, lua-linux, lua-zlib, mupdf,
-	opencv4, osm2pgsql, poke, python-augeas, python-dbus-next,
-	python-pymupdf, rtl_433, rtl8812au-aircrack-ng, seatd, snort3,
-	system-config-printer, usbguard, xml-security-c, xmrig.
-
-	Removed packages: clapack, libsoil.
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13326: regarding dtc error in buildroot source code
-	#13661: host-python2 build fails on aarch64
-	#13836: package build failure when target install set to no on
-	        pkg-generic pkg types
-	#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to
-	        y as before
-
 2021.05.1, released August 10, 2021

 	Important / security related fixes.
@@ -406,102 +196,6 @@
 	#13751: libopenssl (static): huge drop in performance in newer ..
 	#13771: package htop has undeclared dependency on host python

-2021.02.4, released August 10th, 2021
-
-	Important / security related fixes.
-
-	Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II)
-	as it is not currently working.
-
-	binutils: fix linker assert failure on OpenRisc, or1k build
-	issue with gcc < 5
-
-	gdb: Enable on NIOS II
-
-	utils/scanpypi: Various improvements
-
-	Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip
-	sam9x60ek mmc_dev: Add missing toolchain/system options
-
-	Updated/fixed packages: apache, arm-trusted-firmware, audit,
-	avahi, bind, binutils, bird, bluez5_utils, boinc, busybox,
-	chrony, clamav, cryptsetup, cwiid, dnsmasq, docker-cli,
-	docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2,
-	fail2ban, fb-test-app, feh, fetchmail, flac, fluxbox, gawk,
-	gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, gptfdisk,
-	granite, grub2, gqrx, guile, hdparm, heirloom-mailx,
-	ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, intel-microcode,
-	iodine, irqbalance, keepalived, libass, libconfig, libcurl,
-	libfreeimage, libfuse3, libgcrypt, libgtk3, libgudev, libhtp,
-	libjson, libkrb5, libloki, libmodsecurity, libndp,
-	libnetfilter-log, libnfnetlink, libnice, libodb, libodb-boost,
-	libodb-mysql, libodb-pgsql, libpcap, libqmi, libressl,
-	librsvg, libtasn1, libtirpc, libuci, libxmlrpc,
-	linux-firmware, linuxptp, lrzsz, ltp-testsuite, lvm2, mariadb,
-	mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, neard,
-	netsnmp, nettle, nginx-modsecurity, nmap, nodejs, ntp,
-	openntpd, openpgm, openswan, pango, pcre2,
-	perl-crypt-openssl-rsa, php, pixman, polkit, postgresql,
-	proxychains-ng, putty, python, python-django,
-	python-dataproperty, python-pysftp, python-urllib3, python3,
-	qpdf, redis, ripgrep, ruby, samba4, spice, slirp, suricata,
-	sysdig, tcpdump, tftpd, thrift, tor, tpm2-tools, trinity,
-	uboot, uboot-tools, uclibc, util-linux, vlc, wireless-regdb,
-	wireshark, wolfssl, xapp_fonttosfnt, xlib_libX11,
-	xlib_libxshmfence, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13586: grub failure with BR2_OPTIMIZE_3
-	#13661: host-python2 build fails on aarch64
-	#13836: package build failure when target install set to no..
-	#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to..
-
-2021.02.3, released June 12th, 2021
-
-	Important / security related fixes.
-
-	CPE meta data has been added for a large number of packages
-
-	Updated/fixed packages: acpid, apache, apcupsd, assimp, bird,
-	bitcoin, blktrace, boost, capnproto, chrony, dc3dd, dhcp,
-	directfb, dmalloc, docker-engine, ebtables, efibootmgr,
-	enlightenment, enscript, environment-setup, exempi, expat,
-	findutils, flatcc, fluidsynth, frr, gdb, go, gptfdisk, grpc,
-	gst1-plugins-bad, gst1-rtsp-server, gstreamer1, gupnp,
-	hostapd, hwloc, i2c-tools, iftop, imagemagick, imx-gpu-viv,
-	intel-mediadriver, intel-microcode, jquery-validation,
-	keepalived, kodi, less, libcamera, libcurl, libcutl, libesmtp,
-	libeXosip2, libffi, libfuse, libfuse3, libgeos, libgtk2,
-	libgtk3, libical, libidn, libidn2, libkcapi, libldns, libmms,
-	libmodbus, libmspack, libnids, libopenh264, liboping, libraw,
-	librelp, libsamplerate, libtirpc, libusb, libuv, libxcb,
-	libxml2, libxslt, live555, llvm, lmbench, localedef,
-	lttng-tools, lvm2, lz4, mesa3d, mimic, mini-snmpd, minidlna,
-	minissdpd, minizip, mono-gtksharp3, mpg123, mpv, msmtp, musl,
-	mutt, nasm, nbd, netperf, netsurf, nginx, odb, opencv3,
-	openssh, opentyrian, oprofile, p7zip, paho-mqtt-c, perl,
-	php-imagick, pifmrds, picocom, pigz, pngquant, poco,
-	postgresql, prosody, proxychains-ng, pulseaudio, putty, pwgen,
-	python-autobahn, python-bluezero, python-engineio,
-	python-keyring, python-pillow, python-requests, python-tqdm,
-	qemu, qpdf, qt5base, redis, refpolicy, rt-tests, runc,
-	shellinabox, squid, strace, supervisor, synergy, taglib,
-	tclap, terminology, thermald, tini, tinyproxy, tinyxml2,
-	tpm2-tss, uclibc, udisks, uhd, unscd, vlc, waylandpp,
-	webkitgtk, weston, wireshark, wpa_supplicant, wpewebkit,
-	xlib_libdmx, xlib_libFS, xlib_libICE, xlib_libX11,
-	xlib_libXcursor, xlib_libXdmcp, xlib_libXext, xlib_libXfixes,
-	xlib_libXfont2, xlib_libXinerama, xlib_libXpm, xlib_libXres,
-	xlib_libXt, xlib_libXtst, xlib_libXxf86dga, xlib_libXxf86vm,
-	xterm
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13781: isc dhcp-server package don't create file /usr/bin/dhcpd
-	#13801: toolchainfile.cmake CMAKE_BUILD_TYPE
-	#13806: Building host-localedef fails on fedora 34/gcc 11
-
 2021.02.2, released May 12th, 2021

 	Important / security related fixes.
@@ -412,19 +412,6 @@ config BR2_DEBUG_3
 endchoice
 endif

-config BR2_ENABLE_RUNTIME_DEBUG
-	bool "build packages with runtime debugging info"
-	help
-	  Some packages may have runtime assertions, extra traces, and
-	  similar runtime elements that can help debugging. However,
-	  these elements may negatively influence performance so should
-	  normally not be enabled on production systems.
-
-	  Enable this option to enable such runtime debugging.
-
-	  Note: disabling this option is not a guarantee that all
-	  packages effectively removed these runtime debugging elements.
-
 config BR2_STRIP_strip
 	bool "strip target binaries"
 	default y
@@ -853,16 +840,9 @@ endchoice
 comment "RELocation Read Only (RELRO) needs shared libraries"
 	depends on !BR2_SHARED_LIBS

-config BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
-	bool
-	default y
-	# Microblaze glibc toolchains don't work with Fortify Source enabled
-	depends on !BR2_microblaze
-
 choice
 	bool "Buffer-overflow Detection (FORTIFY_SOURCE)"
 	default BR2_FORTIFY_SOURCE_1
-	depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on !BR2_OPTIMIZE_0
 	help
@@ -903,7 +883,6 @@ config BR2_FORTIFY_SOURCE_2
 endchoice

 comment "Fortify Source needs a glibc toolchain and optimization"
-	depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
 	depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0)
 endmenu

@@ -144,115 +144,6 @@ endif

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

-comment "Legacy options removed in 2021.08"
-
-config BR2_OPENJDK_VERSION_LTS
-	bool "OpenJDK LTS version was renamed to OpenJDK 11"
-	select BR2_LEGACY
-	select BR2_PACKAGE_OPENJDK_VERSION_11
-	help
-	  The LTS version option was renamed to OpenJDK 11 to make it
-	  clear what LTS version is.
-
-config BR2_OPENJDK_VERSION_LATEST
-	bool "OpenJDK latest version (16.x) was removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_OPENJDK_VERSION_17
-	help
-	  OpenJDK 16.x is no longer mainted, so the option has been
-	  removed. Use OpenJDK 17.x instead.
-
-config BR2_PACKAGE_GNURADIO_PAGER
-	bool "gnuradio gr-flex support removed"
-	select BR2_LEGACY
-	help
-	  gr-flex has been removed from gnuradio since version 3.8.0.0.
-
-config BR2_PACKAGE_LIBMCRYPT
-	bool "libmcrypt package was removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as "the last update to libmcrypt
-	  was in 2007, despite years of unmerged patches. These facts
-	  have led security experts to declare mcrypt abandonware and
-	  discourage its use in new development" (extract from
-	  https://en.wikipedia.org/wiki/Mcrypt).
-
-config BR2_PACKAGE_MCRYPT
-	bool "mcrypt package was removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as "the last update to libmcrypt
-	  was in 2007, despite years of unmerged patches. These facts
-	  have led security experts to declare mcrypt abandonware and
-	  discourage its use in new development" (extract from
-	  https://en.wikipedia.org/wiki/Mcrypt).
-
-config BR2_PACKAGE_PHP_EXT_MCRYPT
-	bool "PHP mcrypt extension removed"
-	select BR2_LEGACY
-	help
-	  mcrypt has been removed from php since version 7.2.0.
-
-config BR2_BINUTILS_VERSION_2_34_X
-	bool "binutils 2.34 has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.34 has been removed, use a newer version.
-
-config BR2_PACKAGE_LIBSOIL
-	bool "libsoil package removed"
-	select BR2_LEGACY
-	help
-	  The libsoil package was removed. All packages needing
-	  libsoil removed the dependency.
-
-config BR2_PACKAGE_CLAPACK
-	bool "cblas/clapack package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LAPACK if BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN
-	help
-	  The clapack package was removed. LAPACK no longer generates a
-	  C version. Use lapack instead. This does require a Fortran
-	  compiler however.
-
-config BR2_PACKAGE_SPIDERMONKEY
-	bool "spidermonkey package removed"
-	select BR2_LEGACY
-	help
-	  The spidermonkey package was removed. The only package that
-	  depended on spidermonkey was polkit. The spidermonkey
-	  dependency is replaced with duktape.
-
-config BR2_PACKAGE_KODI_LIBVA
-	bool "kodi option to add libva support removed"
-	select BR2_LEGACY
-	help
-	  Kodi still has support for libva if the package is enabled but
-	  the kodi-specific dependencies limiting libva support to non-
-	  OPENGLES platforms were removed including this option.
-
-config BR2_PACKAGE_PYTHON_COHERENCE
-	bool "python-coherence package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it can't be built anymore due
-	  to python-twisted being now incompatible with python 2.
-
-config BR2_PACKAGE_PHP_EXT_XMLRPC
-	bool "PHP XMLRPC extension removed"
-	select BR2_LEGACY
-	help
-	  The XMLRPC php extension was removed.
-	  See: https://wiki.php.net/rfc/unbundle_xmlprc
-
-config BR2_GCC_VERSION_8_X
-	bool "gcc 8.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 8.x has been removed. The current
-	  default version (10.x or later) has been selected instead.
-
 comment "Legacy options removed in 2021.05"

 config BR2_PACKAGE_UDISKS_LVM2
@@ -447,26 +338,6 @@ config BR2_PACKAGE_IPSEC_TOOLS

 comment "Legacy options removed in 2020.11"

-config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
-	bool "compile with fixed serial port speed"
-	select BR2_LEGACY
-	help
-	  Since gpsd 3.20, GPSD_FIXED_PORT_SPEED is replaced
-	  by runtime option --speed.
-
-config BR2_PACKAGE_GPSD_RECONFIGURE
-	bool "allow gpsd to change device settings"
-	select BR2_LEGACY
-	help
-	  Since gpsd 3.21, GPSD_RECONFIGURE is replaced
-	  by runtime option --passive.
-
-config BR2_PACKAGE_GPSD_CONTROLSEND
-	bool "allow gpsctl/gpsmon to change device settings"
-	select BR2_LEGACY
-	help
-	  Option removed in gpsd 3.21
-
 config BR2_PACKAGE_OPENCV
 	bool "opencv package was removed"
 	select BR2_LEGACY
@@ -35,7 +35,6 @@ F:	package/bubblewrap/
 F:	package/cage/
 F:	package/cog/
 F:	package/libepoxy/
-F:	package/libpsl/
 F:	package/libwpe/
 F:	package/webkitgtk/
 F:	package/wlroots/
@@ -229,6 +228,10 @@ 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/libfuse3/
@@ -260,7 +263,6 @@ F:	package/python-canopen/
 N:	Bartosz Bilas <b.bilas@grinn-global.com>
 F:	board/stmicroelectronics/stm32mp157a-dk1/
 F:	configs/stm32mp157a_dk1_defconfig
-F:	package/cegui/
 F:	package/log4qt/
 F:	package/python-esptool/
 F:	package/python-pyaes/
@@ -290,6 +292,7 @@ F:	package/ebtables/
 F:	package/i2c-tools/
 F:	package/libcurl/
 F:	package/libpcap/
+F:	package/openipmi/
 F:	package/socat/
 F:	package/strace/
 F:	package/tcpdump/
@@ -306,7 +309,6 @@ N:	Bernd Kuhls <bernd.kuhls@t-online.de>
 F:	package/alsa-lib/
 F:	package/alsa-utils/
 F:	package/apache/
-F:	package/apg/
 F:	package/apr/
 F:	package/apr-util/
 F:	package/bcg729/
@@ -381,6 +383,7 @@ F:	package/libpng/
 F:	package/libsidplay2/
 F:	package/libsilk/
 F:	package/libsndfile/
+F:	package/libsoil/
 F:	package/libsoundtouch/
 F:	package/libsquish/
 F:	package/libudfread/
@@ -457,7 +460,6 @@ F:	package/waylandpp/
 F:	package/x11r7/
 F:	package/x264/
 F:	package/x265/
-F:	package/xmrig/
 F:	package/ytree/
 F:	package/znc/
 F:	support/testing/tests/package/test_perl_html_parser.py
@@ -493,9 +495,6 @@ F:	package/libsvg-cairo/
 N:	Cédric Chépied <cedric.chepied@gmail.com>
 F:	package/znc/

-N:	Charles Hardin <ckhardin@gmail.com>
-F:	package/alsa-plugins/
-
 N:	Chris Packham <judge.packham@gmail.com>
 F:	package/coremark/
 F:	package/coremark-pro/
@@ -648,7 +647,6 @@ F:	package/x264/

 N:	David GOUARIN <dgouarin@gmail.com>
 F:	package/librelp/
-F:	package/libtalloc/

 N:	David Lechner <david@lechnology.com>
 F:	board/lego/ev3/
@@ -672,15 +670,8 @@ N:	Derrick Lyndon Pallas <derrick@meter.com>
 F:	package/ipcalc/

 N:	Dick Olsson <hi@senzilla.io>
-F:	board/aarch64-efi/
-F:	board/pc/
-F:	board/qemu/aarch64-sbsa/
-F:	boot/arm-trusted-firmware/
-F:	boot/edk2/
-F:	configs/qemu_aarch64_sbsa_defconfig
 F:	package/bearssl/
 F:	package/bitcoin/
-F:	package/edk2-platforms/
 F:	package/execline/
 F:	package/mdevd/
 F:	package/s6-dns/
@@ -691,7 +682,6 @@ F:	package/s6-portable-utils/
 F:	package/s6-rc/
 F:	package/s6/
 F:	package/skalibs/
-F:	support/testing/tests/boot/test_edk2.py

 N:	Dimitrios Siganos <dimitris@siganos.org>
 F:	package/wireless-regdb/
@@ -841,7 +831,6 @@ F:	package/belle-sip/
 F:	package/belr/
 F:	package/boinc/
 F:	package/cairo/
-F:	package/daq3/
 F:	package/duktape/
 F:	package/expat/
 F:	package/flatbuffers/
@@ -898,7 +887,6 @@ F:	package/motion/
 F:	package/mutt/
 F:	package/ncmpc/
 F:	package/oniguruma/
-F:	package/opencv4/
 F:	package/oprofile/
 F:	package/pcmanfm/
 F:	package/perl-extutils-pkgconfig/
@@ -907,10 +895,8 @@ F:	package/python-jedi/
 F:	package/python-parso/
 F:	package/python-yatl/
 F:	package/rocksdb/
-F:	package/rtl_433/
 F:	package/rygel/
 F:	package/safeclib/
-F:	package/snort3/
 F:	package/suricata/
 F:	package/tinycbor/
 F:	package/tinydtls/
@@ -1046,26 +1032,15 @@ F:	package/webp/
 F:	package/xapian/

 N:	Giulio Benetti <giulio.benetti@benettiengineering.com>
-F:	board/olimex/a*
-F:	configs/amarula_vyasa_rk3288_defconfig
-F:	configs/asus_tinker_rk3288_defconfig
-F:	configs/olimex_a*
 F:	package/at/
-F:	package/binutils/
-F:	package/erlang-jiffy/
-F:	package/gcc/
-F:	package/harfbuzz/
 F:	package/libfuse3/
 F:	package/libnspr/
 F:	package/libnss/
 F:	package/minicom/
 F:	package/nfs-utils/
-F:	package/python-uvloop/
 F:	package/sunxi-mali-mainline/
 F:	package/sunxi-mali-mainline-driver/
-F:	package/trace-cmd/
 F:	package/udisks/
-F:	toolchain/

 N:	Gregory Dymarek <gregd72002@gmail.com>
 F:	package/ding-libs/
@@ -1118,8 +1093,6 @@ F:	configs/arm_juno_defconfig
 F:	board/arm/juno/

 N:	Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-F:	board/terasic/de10nano_cyclone5/
-F:	configs/terasic_de10nano_cyclone5_defconfig
 F:	package/gnuradio/
 F:	package/gqrx/
 F:	package/gr-osmosdr/
@@ -1133,8 +1106,6 @@ F:	package/python-sip/
 F:	package/uhd/

 N:	Heiko Thiery <heiko.thiery@gmail.com>
-F:	board/kontron/pitx-imx8m/
-F:	configs/kontron_pitx_imx8m_defconfig
 F:	package/altera-stapl/
 F:	package/ipmitool/
 F:	package/libnetconf2/
@@ -1280,9 +1251,6 @@ F:	package/sysrepo/
 N:	Jan Pedersen <jp@jp-embedded.com>
 F:	package/zip/

-N:	Jared Bents <jared.bents@rockwellcollins.com>
-F:	package/libvirt/
-
 N:	Jarkko Sakkinen <jarkko.sakkinen@intel.com>
 F:	package/quota/

@@ -1326,13 +1294,8 @@ F:	package/rtty/
 N:	Joachim Wiberg <troglobit@gmail.com>
 F:	configs/globalscale_espressobin_defconfig
 F:	board/globalscale/espressobin/
-F:	package/inadyn/
-F:	package/libite/
-F:	package/libuev/
 F:	package/mg/
-F:	package/mrouted/
 F:	package/netcalc/
-F:	package/smcroute/
 F:	package/ssdp-responder/
 F:	package/sysklogd/

@@ -1452,6 +1415,7 @@ F:	package/python-schedule/
 F:	package/python-sentry-sdk/
 F:	package/python-websockets/
 F:	package/python-xlib/
+F:	package/sentry-cli/
 F:	package/sentry-native/
 F:	package/unclutter-xfixes/

@@ -1519,8 +1483,6 @@ F:	package/dtach/
 N:	Kamel Bouhara <kamel.bouhara@gmail.com>
 F:	package/libodb-boost/
 F:	package/libodb-mysql/
-F:	package/libqb/
-F:	package/usbguard/

 N:	Karoly Kasza <kaszak@gmail.com>
 F:	package/irqbalance/
@@ -1672,7 +1634,6 @@ F:	package/murata-cyw-fw/
 F:	package/netdata/
 F:	package/python-ansicolors/
 F:	package/python-bleak/
-F:	package/python-dbus-next/
 F:	package/python-iniconfig/
 F:	package/python-intelhex/
 F:	package/python-packaging/
@@ -1683,11 +1644,9 @@ F:	package/python-typing-extensions/
 F:	package/python-xmodem/
 F:	package/rs485conf/
 F:	package/turbolua/
-F:	support/testing/tests/package/sample_python_dbus_next.py
 F:	support/testing/tests/package/sample_python_pytest.py
 F:	support/testing/tests/package/sample_python_pytest_asyncio.py
 F:	support/testing/tests/package/test_netdata.py
-F:	support/testing/tests/package/test_python_dbus_next.py
 F:	support/testing/tests/package/test_python_pytest.py
 F:	support/testing/tests/package/test_python_pytest_asyncio.py

@@ -1800,7 +1759,6 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/libssh2/
-F:	package/libtalloc/
 F:	package/libqmi/
 F:	package/lighttpd/
 F:	package/logrotate/
@@ -1847,7 +1805,6 @@ F:	package/valijson/
 F:	package/wpa_supplicant/
 F:	package/wireless_tools/
 F:	package/xen/
-F:	package/xml-security-c/
 F:	support/testing/tests/package/br2-external/openjdk/
 F:	support/testing/tests/package/test_openjdk.py
 F:	support/testing/tests/package/test_opkg/
@@ -1878,12 +1835,40 @@ N:	Max Filippov <jcmvbkbc@gmail.com>
 F:	arch/Config.in.xtensa

 N:	Maxim Kochetkov <fido_max@inbox.ru>
-F:	package/libosmium/
-F:	package/osm2pgsql/
 F:	package/postgis/
 F:	package/protozero/
 F:	package/timescaledb/

+N:	Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+F:	package/babeld/
+F:	package/dante/
+F:	package/faifa/
+F:	package/initscripts/
+F:	package/intel-microcode/
+F:	package/iucode-tool/
+F:	package/jasper/
+F:	package/kodi/
+F:	package/libass/
+F:	package/libbluray/
+F:	package/libcdio/
+F:	package/libcofi/
+F:	package/libenca/
+F:	package/libmodplug/
+F:	package/libnfs/
+F:	package/libplist/
+F:	package/libshairplay/
+F:	package/linux-zigbee/
+F:	package/netcat-openbsd/
+F:	package/open-plc-utils/
+F:	package/rpi-firmware/
+F:	package/rpi-userland/
+F:	package/rtmpdump/
+F:	package/skeleton/
+F:	package/systemd/
+F:	package/systemd-bootchart/
+F:	package/tinyalsa/
+F:	package/tinyxml/
+
 N:	Michael Durrant <mdurrant@arcturusnetworks.com>
 F:	board/arcturus/
 F:	configs/arcturus_ucp1020_defconfig
@@ -1947,6 +1932,10 @@ F:	package/shadowsocks-libev/
 N:	Mircea Gliga <gliga.mircea@gmail.com>
 F:	package/mbuffer/

+N:	Mirza Krak <mirza.krak@northern.tech>
+F:	package/mender/
+F:	package/mender-artifact/
+
 N:	Murat Demirten <mdemirten@yh.com.tr>
 F:	package/jpeg-turbo/
 F:	package/libgeotiff/
@@ -1971,13 +1960,7 @@ F:	board/intel/galileo/
 F:	configs/galileo_defconfig

 N:	Nicolas Carrier <nicolas.carrier@orolia.com>
-F:	package/bmap-tools/
 F:	package/php-xdebug/
-F:	package/python-augeas/
-F:	support/testing/tests/package/sample_bmap_tools.sh
-F:	support/testing/tests/package/sample_python_augeas.py
-F:	support/testing/tests/package/test_bmap_tools.py
-F:	support/testing/tests/package/test_python_augeas.py

 N:	Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
 F:	package/libgit2/
@@ -2148,7 +2131,6 @@ F:	package/qt5/
 F:	package/quotatool/
 F:	package/racehound/
 F:	package/redir/
-F:	package/rtl8812au-aircrack-ng/
 F:	package/uredir/
 F:	package/wayland-utils/

@@ -2248,13 +2230,10 @@ N:	Ramon Fried <rfried.dev@gmail.com>
 F:	package/bitwise/

 N:	Raphaël Mélotte <raphael.melotte@mind.be>
-F:	package/gumbo-parser/
 F:	package/jbig2dec/
-F:	package/mupdf/
 F:	package/python-boto3/
 F:	package/python-botocore/
 F:	package/python-jmespath/
-F:	package/python-pymupdf/
 F:	package/python-s3transfer/

 N:	Refik Tuzakli <tuzakli.refik@gmail.com>
@@ -2318,7 +2297,6 @@ F:	package/glibc/
 F:	package/irrlicht/
 F:	package/liblinear/
 F:	package/lensfun/
-F:	package/libbpf/
 F:	package/libclc/
 F:	package/libgta/
 F:	package/libiec61850/
@@ -2373,6 +2351,7 @@ F:	package/lrzip/
 N:	Samuel Martin <s.martin49@gmail.com>
 F:	package/armadillo/
 F:	package/canfestival/
+F:	package/clapack/
 F:	package/cwiid/
 F:	package/flite/
 F:	package/nginx/
@@ -2543,6 +2522,9 @@ F:	configs/rock_pi_n10_defconfig
 F:	configs/rockpro64_defconfig
 F:	package/arm-gnu-a-toolchain/

+N:	Sven Fischer <sven@leiderfischer.de>
+F:	package/qt5/qt5remoteobjects/
+
 N:	Sven Haardiek <sven.haardiek@iotec-gmbh.de>
 F:	package/lcdproc/
 F:	package/python-influxdb/
@@ -2626,7 +2608,6 @@ F:	configs/stm32mp157c_dk2_defconfig
 F:	package/android-tools/
 F:	package/b43-firmware/
 F:	package/b43-fwcutter/
-F:	package/bmap-tools/
 F:	package/c-periphery/
 F:	package/cdrkit/
 F:	package/cifs-utils/
@@ -2664,7 +2645,6 @@ F:	package/pkg-autotools.mk
 F:	package/pkg-generic.mk
 F:	package/python/
 F:	package/python3/
-F:	package/python-augeas/
 F:	package/python-mad/
 F:	package/python-serial/
 F:	package/qextserialport/
@@ -2678,8 +2658,6 @@ F:	package/squashfs/
 F:	package/wayland/
 F:	package/weston/
 F:	support/testing/tests/boot/test_syslinux.py
-F:	support/testing/tests/package/sample_python_augeas.py
-F:	support/testing/tests/package/test_python_augeas.py
 F:	toolchain/

 N:	Timo Ketola <timo.ketola@exertus.fi>
@@ -2726,7 +2704,6 @@ F:	package/utp_com/
 N:	Vincent Stehlé <vincent.stehle@laposte.net>
 F:	board/bananapi/bananapi-m2-zero/
 F:	configs/bananapi_m2_zero_defconfig
-F:	configs/uevm5432_defconfig
 F:	package/i7z/
 F:	package/msr-tools/
 F:	package/pixz/
@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2021.08.3
+export BR2_VERSION := 2021.05.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1639435000
+BR2_VERSION_EPOCH = 1628580000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -663,17 +663,32 @@ endef
 TARGET_FINALIZE_HOOKS += TOOLCHAIN_ECLIPSE_REGISTER
 endif

-# Generate locale data.
+# Generate locale data. Basically, we call the localedef program
+# (built by the host-localedef package) for each locale. The input
+# data comes preferably from the toolchain, or if the toolchain does
+# not have them (Linaro toolchains), we use the ones available on the
+# host machine.
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 GLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE))
 ifneq ($(GLIBC_GENERATE_LOCALES),)
 PACKAGES += host-localedef

 define GENERATE_GLIBC_LOCALES
-	$(MAKE) -f support/misc/gen-glibc-locales.mk \
-		ENDIAN=$(call LOWERCASE,$(BR2_ENDIAN)) \
-		LOCALES="$(GLIBC_GENERATE_LOCALES)" \
-		Q=$(Q)
+	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
+	$(Q)for locale in $(GLIBC_GENERATE_LOCALES) ; do \
+		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
+		charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
+		if test -z "$${charmap}" ; then \
+			charmap="UTF-8" ; \
+		fi ; \
+		echo "Generating locale $${inputfile}.$${charmap}" ; \
+		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
+		$(HOST_DIR)/bin/localedef \
+			--prefix=$(TARGET_DIR) \
+			--$(call LOWERCASE,$(BR2_ENDIAN))-endian \
+			-i $${inputfile} -f $${charmap} \
+			$${locale} ; \
+	done
 endef
 TARGET_FINALIZE_HOOKS += GENERATE_GLIBC_LOCALES
 endif
@@ -1068,7 +1083,7 @@ printvars:
 		$(if $(QUOTED_VARS),\
 			$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
 			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
-# ')))) # Syntax colouring...
+# ' Syntax colouring...

 .PHONY: clean
 clean:
@@ -321,10 +321,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_10
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9

-config BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_10
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -11,7 +11,7 @@ image boot.vfat {
 		}

 		file boot.bin {
-			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.bin"
+			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin"
 		}
 	}
 	size = 16M
@@ -11,7 +11,7 @@ image boot.vfat {
 		}
 		
 		file boot.bin {
-			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.10.3.bin"
+			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin"
 		} 
 	}
 	size = 16M
@@ -23,8 +23,6 @@ This guide covers the following configurations:
 - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig
 - microchip_sam9x60ek_mmc_defconfig
 - microchip_sam9x60ek_mmc_dev_defconfig
- - microchip_sama5d2_icp_mmc_defconfig
- - microchip_sama5d2_icp_mmc_dev_defconfig

 These configurations will use AT91Bootstrap, u-boot and a linux kernel from
 the git trees maintained by Atmel.
@@ -1,28 +0,0 @@
-From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba6..24af549977 100644
--- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
-YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
-- 
-2.20.1
-
@@ -1,4 +1,4 @@
 label linux
  kernel /boot/Image
-  devicetree /boot/jh7100-beaglev-starlight.dtb
+  devicetree /boot/starfive_vic7100_beagle_v.dtb
  append console=ttyS0,115200 earlyprintk root=PARTUUID=0fef845a-c6e1-45bc-82f7-002fa720f958 rootwait
@@ -0,0 +1,39 @@
+From 2c4c813940c577590f3352cef0c49a8def17905d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Wed, 28 Apr 2021 22:58:45 +0200
+Subject: [PATCH] include/configs/starfive-vic7100: adjust fdt_addr_r
+
+The default fdt_addr_r of 0x88000000 doesn't work, the kernel never
+boots. Using 0x90000000 works fine.
+
+Since it would overlap with the kernel_comp_addr_r area, this one is
+moved 16 MB further, at 0x91000000.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ include/configs/starfive-vic7100.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/starfive-vic7100.h b/include/configs/starfive-vic7100.h
+index 8c5915a73c..7150a23873 100644
+--- a/include/configs/starfive-vic7100.h
+++ b/include/configs/starfive-vic7100.h
+@@ -111,13 +111,13 @@
+ 	"fdt_high=0xffffffffffffffff\0" \
+ 	"initrd_high=0xffffffffffffffff\0" \
+ 	"kernel_addr_r=0x84000000\0" \
+-	"fdt_addr_r=0x88000000\0" \
+	"fdt_addr_r=0x90000000\0" \
+ 	"scriptaddr=0x88100000\0" \
+ 	"script_offset_f=0x1fff000\0" \
+ 	"script_size_f=0x1000\0" \
+ 	"pxefile_addr_r=0x88200000\0" \
+ 	"ramdisk_addr_r=0x88300000\0" \
+-	"kernel_comp_addr_r=0x90000000\0" \
+	"kernel_comp_addr_r=0x91000000\0" \
+ 	"kernel_comp_size=0x10000000\0" \
+ 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
+ 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
+-- 
+2.30.2
+
@@ -1,6 +1,12 @@
 #!/bin/sh
 BOARD_DIR=$(dirname $0)

+# The DTB to use is provided within the U-Boot source tree, so we grab
+# it from there, and install it to TARGET_DIR/boot/.
+eval $(make -C ${CONFIG_DIR} --no-print-directory QUOTED_VARS=YES VARS=UBOOT_DIR printvars)
+install -D -m0644 ${UBOOT_DIR}/arch/riscv/dts/starfive_vic7100_beagle_v.dtb \
+	${TARGET_DIR}/boot/starfive_vic7100_beagle_v.dtb
+
 # Bring the extlinux.conf file in.
 install -D -m 0644 ${BOARD_DIR}/extlinux.conf \
 	${TARGET_DIR}/boot/extlinux/extlinux.conf
@@ -30,6 +30,7 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=4
 CONFIG_NUMA=y
+CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 CONFIG_CRASH_DUMP=y
 CONFIG_COMPAT=y
@@ -45,7 +46,6 @@ CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
@@ -96,6 +96,7 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_DENALI_DT=y
 CONFIG_MTD_SPI_NOR=y
+CONFIG_SPI_CADENCE_QUADSPI=y
 CONFIG_OF_OVERLAY=y
 # CONFIG_BLK_DEV is not set
 CONFIG_SRAM=y
@@ -115,39 +116,12 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_NETDEVICES=y
 # CONFIG_ETHERNET is not set
-CONFIG_PHYLIB=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8152=y
+CONFIG_USB_USBNET=y
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_WLAN_VENDOR_ATH is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
@@ -165,6 +139,7 @@ CONFIG_MWIFIEX_SDIO=m
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
@@ -205,9 +180,9 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MT65XX=y
 CONFIG_I2C_RK3X=y
+CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
-CONFIG_SPI_CADENCE_QUADSPI=y
 CONFIG_SPI_NXP_FLEXSPI=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_MT65XX=y
@@ -226,6 +201,7 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_MAX77620=y
+CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -369,6 +345,7 @@ CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_CROS_EC=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_DMADEVICES=y
 CONFIG_FSL_EDMA=y
@@ -378,14 +355,14 @@ CONFIG_MTK_CQDMA=y
 CONFIG_QCOM_HIDMA_MGMT=y
 CONFIG_QCOM_HIDMA=y
 # CONFIG_VIRTIO_MENU is not set
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CROS_EC=y
+CONFIG_MFD_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_CS2000_CP=y
 CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 CONFIG_COMMON_CLK_VC5=y
@@ -403,11 +380,17 @@ CONFIG_REMOTEPROC=y
 CONFIG_MTK_CMDQ=y
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_EXTCON_USB_GPIO=y
+CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_IIO=y
 CONFIG_MAX9611=m
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 CONFIG_SENSORS_ISL29018=m
+CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_MPL3115=m
 CONFIG_PWM=y
+CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_MTK_DISP=y
 CONFIG_PWM_MEDIATEK=y
 CONFIG_PHY_XGENE=y
@@ -434,13 +417,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_PSTORE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS2=y
-CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_SECURITY=y
@@ -474,4 +450,4 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_STACKTRACE=y
 # CONFIG_FTRACE is not set
-# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_STRICT_DEVMEM is not set
@@ -0,0 +1,35 @@
+From 510d0ad0ce1b51c072309ba12dfb024fc2c3dbac Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:22 +0200
+Subject: [PATCH 1/5] drm/bridge_connector: Set default status connected for
+ eDP connectors
+
+In an eDP application, HPD is not required and on most bridge chips
+useless. If HPD is not used, we need to set initial status as connected,
+otherwise the connector created by the drm_bridge_connector API remains
+in an unknown state.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Reviewed-by: Bilal Wasim <bwasim.lkml@gmail.com>
+Tested-by: Bilal Wasim <bwasim.lkml@gmail.com>
+---
+ drivers/gpu/drm/drm_bridge_connector.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c
+index c6994fe673f3..a58cbde59c34 100644
+--- a/drivers/gpu/drm/drm_bridge_connector.c
+++ b/drivers/gpu/drm/drm_bridge_connector.c
+@@ -187,6 +187,7 @@ drm_bridge_connector_detect(struct drm_connector *connector, bool force)
+ 		case DRM_MODE_CONNECTOR_DPI:
+ 		case DRM_MODE_CONNECTOR_LVDS:
+ 		case DRM_MODE_CONNECTOR_DSI:
+		case DRM_MODE_CONNECTOR_eDP:
+ 			status = connector_status_connected;
+ 			break;
+ 		default:
+-- 
+2.25.1
+
@@ -0,0 +1,50 @@
+From cc0f2fea61fb34ca84e4812a615e0035d812aa8b Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:23 +0200
+Subject: [PATCH 2/5] drm/bridge: ps8640: Get the EDID from eDP control
+
+The PS8640 DSI-to-eDP bridge can retrieve the EDID, so implement the
+.get_edid callback and set the flag to indicate the core to use it.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index 4b099196afeb..13755d278db6 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
+++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -242,8 +242,18 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge,
+ 	return ret;
+ }
+ 
+static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge,
+					   struct drm_connector *connector)
+{
+	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+
+	return drm_get_edid(connector,
+			    ps_bridge->page[PAGE0_DP_CNTL]->adapter);
+}
+
+ static const struct drm_bridge_funcs ps8640_bridge_funcs = {
+ 	.attach = ps8640_bridge_attach,
+	.get_edid = ps8640_bridge_get_edid,
+ 	.post_disable = ps8640_post_disable,
+ 	.pre_enable = ps8640_pre_enable,
+ };
+@@ -294,6 +304,8 @@ static int ps8640_probe(struct i2c_client *client)
+ 
+ 	ps_bridge->bridge.funcs = &ps8640_bridge_funcs;
+ 	ps_bridge->bridge.of_node = dev->of_node;
+	ps_bridge->bridge.ops = DRM_BRIDGE_OP_EDID;
+	ps_bridge->bridge.type = DRM_MODE_CONNECTOR_eDP;
+ 
+ 	ps_bridge->page[PAGE0_DP_CNTL] = client;
+ 
+-- 
+2.25.1
+
@@ -0,0 +1,35 @@
+From 62afc499fc46c8018f40733c31a675b28f0717d8 Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:24 +0200
+Subject: [PATCH 3/5] drm/bridge: ps8640: Return an error for incorrect attach
+ flags
+
+Bridge drivers that implement the new model only shall return an error
+from their attach() handler when the DRM_BRIDGE_ATTACH_NO_CONNECTOR flag
+is not set. So make sure we return an error because only the new
+drm_bridge model is supported.
+
+Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index 13755d278db6..ce3e8b2da8c9 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
+++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -200,6 +200,10 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge,
+ 						   .channel = 0,
+ 						   .node = NULL,
+ 						 };
+
+	if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
+		return -EINVAL;
+
+ 	/* port@0 is ps8640 dsi input port */
+ 	in_ep = of_graph_get_endpoint_by_regs(dev->of_node, 0, -1);
+ 	if (!in_ep)
+-- 
+2.25.1
+
@@ -0,0 +1,58 @@
+From 4897262a71cbf55d726d9174f5f646897dc13704 Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:25 +0200
+Subject: [PATCH 4/5] drm/bridge: ps8640: Print an error if VDO control fails
+
+Print an error message inside ps8640_bridge_vdo_control() function when
+it fails so we can simplify a bit the callers, they will only need to
+check the error code.
+
+Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index ce3e8b2da8c9..9f7b7a9c53c5 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
+++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -82,8 +82,11 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge,
+ 	ret = i2c_smbus_write_i2c_block_data(client, PAGE3_SET_ADD,
+ 					     sizeof(vdo_ctrl_buf),
+ 					     vdo_ctrl_buf);
+-	if (ret < 0)
+	if (ret < 0) {
+		DRM_ERROR("failed to %sable VDO: %d\n",
+			  ctrl == ENABLE ? "en" : "dis", ret);
+ 		return ret;
+	}
+ 
+ 	return 0;
+ }
+@@ -150,10 +153,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge)
+ 	}
+ 
+ 	ret = ps8640_bridge_vdo_control(ps_bridge, ENABLE);
+-	if (ret) {
+-		DRM_ERROR("failed to enable VDO: %d\n", ret);
+	if (ret)
+ 		goto err_regulators_disable;
+-	}
+ 
+ 	/* Switch access edp panel's edid through i2c */
+ 	ret = i2c_smbus_write_byte_data(client, PAGE2_I2C_BYPASS,
+@@ -175,9 +176,7 @@ static void ps8640_post_disable(struct drm_bridge *bridge)
+ 	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+ 	int ret;
+ 
+-	ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+-	if (ret < 0)
+-		DRM_ERROR("failed to disable VDO: %d\n", ret);
+	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+ 
+ 	gpiod_set_value(ps_bridge->gpio_reset, 1);
+ 	gpiod_set_value(ps_bridge->gpio_powerdown, 1);
+-- 
+2.25.1
+
@@ -0,0 +1,162 @@
+From 5bb60fe7c748a0aae2bdbab10e73b2dc48c09dda Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:26 +0200
+Subject: [PATCH 5/5] drm/bridge: ps8640: Rework power state handling
+
+The get_edid() callback can be triggered anytime by an ioctl, i.e
+
+  drm_mode_getconnector (ioctl)
+    -> drm_helper_probe_single_connector_modes
+       -> drm_bridge_connector_get_modes
+          -> ps8640_bridge_get_edid
+
+Actually if the bridge pre_enable() function was not called before
+get_edid(), the driver will not be able to get the EDID properly and
+display will not work until a second get_edid() call is issued and if
+pre_enable() is called before. The side effect of this, for example, is
+that you see anything when `Frecon` starts, neither the splash screen,
+until the graphical session manager starts.
+
+To fix this we need to make sure that all we need is enabled before
+reading the EDID. This means the following:
+
+1. If get_edid() is called before having the device powered we need to
+   power on the device. In such case, the driver will power off again the
+   device.
+
+2. If get_edid() is called after having the device powered, all should
+   just work. We added a powered flag in order to avoid recurrent calls
+   to ps8640_bridge_poweron() and unneeded delays.
+
+3. This seems to be specific for this device, but we need to make sure
+   the panel is powered on before do a power on cycle on this device.
+   Otherwise the device fails to retrieve the EDID.
+
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 64 +++++++++++++++++++++++---
+ 1 file changed, 58 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index 9f7b7a9c53c5..c5d76e209bda 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
+++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -65,6 +65,7 @@ struct ps8640 {
+ 	struct regulator_bulk_data supplies[2];
+ 	struct gpio_desc *gpio_reset;
+ 	struct gpio_desc *gpio_powerdown;
+	bool powered;
+ };
+ 
+ static inline struct ps8640 *bridge_to_ps8640(struct drm_bridge *e)
+@@ -91,13 +92,15 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge,
+ 	return 0;
+ }
+ 
+-static void ps8640_pre_enable(struct drm_bridge *bridge)
+static void ps8640_bridge_poweron(struct ps8640 *ps_bridge)
+ {
+-	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+ 	struct i2c_client *client = ps_bridge->page[PAGE2_TOP_CNTL];
+ 	unsigned long timeout;
+ 	int ret, status;
+ 
+	if (ps_bridge->powered)
+		return;
+
+ 	ret = regulator_bulk_enable(ARRAY_SIZE(ps_bridge->supplies),
+ 				    ps_bridge->supplies);
+ 	if (ret < 0) {
+@@ -164,6 +167,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge)
+ 		goto err_regulators_disable;
+ 	}
+ 
+	ps_bridge->powered = true;
+
+ 	return;
+ 
+ err_regulators_disable:
+@@ -171,12 +176,12 @@ static void ps8640_pre_enable(struct drm_bridge *bridge)
+ 			       ps_bridge->supplies);
+ }
+ 
+-static void ps8640_post_disable(struct drm_bridge *bridge)
+static void ps8640_bridge_poweroff(struct ps8640 *ps_bridge)
+ {
+-	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+ 	int ret;
+ 
+-	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+	if (!ps_bridge->powered)
+		return;
+ 
+ 	gpiod_set_value(ps_bridge->gpio_reset, 1);
+ 	gpiod_set_value(ps_bridge->gpio_powerdown, 1);
+@@ -184,6 +189,28 @@ static void ps8640_post_disable(struct drm_bridge *bridge)
+ 				     ps_bridge->supplies);
+ 	if (ret < 0)
+ 		DRM_ERROR("cannot disable regulators %d\n", ret);
+
+	ps_bridge->powered = false;
+}
+
+static void ps8640_pre_enable(struct drm_bridge *bridge)
+{
+	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+	int ret;
+
+	ps8640_bridge_poweron(ps_bridge);
+
+	ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+	if (ret < 0)
+		ps8640_bridge_poweroff(ps_bridge);
+}
+
+static void ps8640_post_disable(struct drm_bridge *bridge)
+{
+	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+
+	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+	ps8640_bridge_poweroff(ps_bridge);
+ }
+ 
+ static int ps8640_bridge_attach(struct drm_bridge *bridge,
+@@ -249,9 +276,34 @@ static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge,
+ 					   struct drm_connector *connector)
+ {
+ 	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+	bool poweroff = !ps_bridge->powered;
+	struct edid *edid;
+
+	/*
+	 * When we end calling get_edid() triggered by an ioctl, i.e
+	 *
+	 *   drm_mode_getconnector (ioctl)
+	 *     -> drm_helper_probe_single_connector_modes
+	 *        -> drm_bridge_connector_get_modes
+	 *           -> ps8640_bridge_get_edid
+	 *
+	 * We need to make sure that what we need is enabled before reading
+	 * EDID, for this chip, we need to do a full poweron, otherwise it will
+	 * fail.
+	 */
+	drm_bridge_chain_pre_enable(bridge);
+ 
+-	return drm_get_edid(connector,
+	edid = drm_get_edid(connector,
+ 			    ps_bridge->page[PAGE0_DP_CNTL]->adapter);
+
+	/*
+	 * If we call the get_edid() function without having enabled the chip
+	 * before, return the chip to its original power state.
+	 */
+	if (poweroff)
+		drm_bridge_chain_post_disable(bridge);
+
+	return edid;
+ }
+ 
+ static const struct drm_bridge_funcs ps8640_bridge_funcs = {
+-- 
+2.25.1
+
@@ -0,0 +1,41 @@
+From 51109530891c981b681816152bd205724deabcca Mon Sep 17 00:00:00 2001
+From: Jitao Shi <jitao.shi@mediatek.com>
+Date: Sat, 10 Oct 2020 15:09:09 +0800
+Subject: [PATCH] Revert "drm/mediatek: dsi: Fix scrolling of panel with small
+ hfp or hbp"
+
+This reverts commit 35bf948f1edbf507f6e57e0879fa6ea36d2d2930.
+
+Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
+Reviewed-by: Bilal Wasim <bilal.wasim@imgtec.com>
+Tested-by: Bilal Wasim <bilal.wasim@imgtec.com>
+---
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
+index 80b7a082e874..16fd99dcdacf 100644
+--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
+@@ -466,13 +466,14 @@ static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi)
+ 	horizontal_sync_active_byte = (vm->hsync_len * dsi_tmp_buf_bpp - 10);
+ 
+ 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)
+-		horizontal_backporch_byte = vm->hback_porch * dsi_tmp_buf_bpp;
+		horizontal_backporch_byte =
+			(vm->hback_porch * dsi_tmp_buf_bpp - 10);
+ 	else
+-		horizontal_backporch_byte = (vm->hback_porch + vm->hsync_len) *
+-					    dsi_tmp_buf_bpp;
+		horizontal_backporch_byte = ((vm->hback_porch + vm->hsync_len) *
+			dsi_tmp_buf_bpp - 10);
+ 
+ 	data_phy_cycles = timing->lpx + timing->da_hs_prepare +
+-			  timing->da_hs_zero + timing->da_hs_exit;
+			  timing->da_hs_zero + timing->da_hs_exit + 3;
+ 
+ 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) {
+ 		if ((vm->hfront_porch + vm->hback_porch) * dsi_tmp_buf_bpp >
+-- 
+2.25.1
+
@@ -1,16 +0,0 @@
-image sdcard.img {
-  hdimage {
-  }
-
-  partition u-boot {
-    in-partition-table = "no"
-    image = "%UBOOTBIN%"
-    offset = 1024
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-    offset = 8M
-  }
-}
@@ -26,6 +26,5 @@ image sdcard.img {
  partition rootfs {
    partition-type = 0x83
    image = "rootfs.ext2"
-    offset = 8M
  }
 }
@@ -47,8 +47,6 @@ genimage_type()
 	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
 		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		    echo "genimage.cfg.template_no_boot_part_spl"
-		else
-		    echo "genimage.cfg.template_no_boot_part"
 		fi
 	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"
@@ -1,4 +0,0 @@
-Label imx7d-sabresd-buildroot
-  kernel /boot/zImage
-  devicetree /boot/imx7d-sdb.dtb
-  append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}
@@ -1,8 +0,0 @@
-echo "Root File Sytem on MMC${devnum}"
-setenv rootfs /dev/mmcblk${devnum}p1
-setenv bootargs root=${rootfs} rootwait rw ${extrabootargs}
-
-load ${devtype} ${devnum} ${kernel_addr_r} boot/Image
-load ${devtype} ${devnum} ${fdt_addr_r} boot/imx8mq-kontron-pitx-imx8m.dtb
-
-booti ${kernel_addr_r} - ${fdt_addr_r}
@@ -1,16 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition imx-boot {
-		in-partition-table = "no"
-		image = "imx8-boot-sd.bin"
-		offset = 33k
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		offset = 8M
-	}
-}
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-mkdir -p $TARGET_DIR/boot/
-cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-support/scripts/genimage.sh -c $(dirname $0)/genimage.cfg
@@ -1,74 +0,0 @@
-Kontron pitx-imx8m
-==================
-
-https://www.kontron.com/produkte/pitx-imx8m/p155258
-
-
-How to build it
-===============
-
-Configure buildroot:
-
-  $ make kontron_pitx_imx8m_defconfig
-
-Change settings to fit your needs (optional):
-
-  $ make menuconfig
-
-Compile everything and buildr the rootfs image:
-
-  $ make
-
-
-Result of the build
-===================
-
-After building, the output/images directory contains:
-
-  output/images/
-    ├── bl31.bin
-    ├── boot.scr
-    ├── ddr_fw.bin
-    ├── Image
-    ├── imx8-boot-sd.bin
-    ├── imx8mq-kontron-pitx-imx8m.dtb
-    ├── lpddr4_pmu_train_fw.bin
-    ├── rootfs.ext2
-    ├── rootfs.ext4 -> rootfs.ext2
-    ├── rootfs.tar
-    ├── sdcard.img
-    ├── signed_hdmi_imx8m.bin
-    ├── u-boot.bin
-    ├── u-boot.itb
-    ├── u-boot-nodtb.bin
-    ├── u-boot-spl.bin
-    └── u-boot-spl-ddr.bin
-
-
-Flashing the SD card image
-==========================
-
-To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC)
-
-  $ sudo dd if=output/images/sdcard.img of=<your-sd-device>
-
-
-Preparing the board
-===================
-
- * Connect a serial line to the board
- * Insert the SD card
- * Make sure the boot source selection DIP switches are set correctly
-  * SW1 1-4 OFF
-  * SW1 2-3 OFF
- * Power-up the board
-
-
-Booting the board
-=================
-
-By default the bootloader will search for the first valid image, starting
-with the internal eMMC. To make sure the bootloader loads bootscript from
-the correct location (SD card) set the boot_targets environment variable:
-
-  $ setenv boot_targets mmc1
@@ -1,31 +0,0 @@
-# Image for SD card boot on Microchip SAMA5D2 ICP (Industrial Connectivity Platform)
-#
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"at91-sama5d2_icp.dtb",
-			"boot.bin",
-			"u-boot.bin"
-		}
-	}
-	size = 16M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 1M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
@@ -1,4 +0,0 @@
-label Olinuxino
-    kernel /boot/zImage
-    fdtdir /boot
-    append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
@@ -1,52 +0,0 @@
-From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <dmueller@suse.com>
-Date: Tue, 14 Jan 2020 18:53:41 +0100
-Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
-
-gcc 10 will default to -fno-common, which causes this error at link
-time:
-
-  (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
-
-This is because both dtc-lexer as well as dtc-parser define the same
-global symbol yyloc. Before with -fcommon those were merged into one
-defintion. The proper solution would be to to mark this as "extern",
-however that leads to:
-
-  dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
-   26 | extern YYLTYPE yylloc;
-      |                ^~~~~~
-In file included from dtc-lexer.l:24:
-dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
-  127 | extern YYLTYPE yylloc;
-      |                ^~~~~~
-cc1: all warnings being treated as errors
-
-which means the declaration is completely redundant and can just be
-dropped.
-
-Signed-off-by: Dirk Mueller <dmueller@suse.com>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-[robh: cherry-pick from upstream]
-Cc: stable@vger.kernel.org
-Signed-off-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index 06c040902444..d1b3810156c7 100644
--- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
-YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
-- 
-2.25.1
-
@@ -1,28 +0,0 @@
-From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba6..24af549977 100644
--- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
-YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
-- 
-2.20.1
-
@@ -1,6 +1,6 @@
 setenv fdt_high ffffffff

-setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait

 fatload mmc 0 $kernel_addr_r zImage
 fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb
@@ -13,17 +13,13 @@ image boot.vfat {

 image sdcard.img {
 	hdimage {
-		# for root=PARTLABEL support
-		gpt = true
-		# default GPT location conflicts with bootloaders, move it after
-		gpt-location = 1M
 	}

 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
 		offset = 8192
-		size = 1056768 # 1MB - 8K + 16K(GPT)
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -32,8 +28,6 @@ image sdcard.img {
 		image = "boot.vfat"
 	}

-	# 'rootfs' will be used as the partition label, used
-	# with root=PARTLABEL=rootfs kernel command line
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext4"
@@ -19,9 +19,15 @@ image sdcard.img {

 	partition spl {
 		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
+		image = "sunxi-spl.bin"
 		offset = 8192
-		size = 1056768 # 1MB - 8K + 16K(GPT)
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1024000 # 1MB - 40K + 16K(GPT)
 	}

 	partition boot {
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BOARD_DIR="$(dirname $0)"
-
-cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
-
-# The QEMU sbsa machine expects flash devices to be 256M.
-truncate -s 256M ${BINARIES_DIR}/SBSA_FLASH0.fd
-truncate -s 256M ${BINARIES_DIR}/SBSA_FLASH1.fd
@@ -1,30 +0,0 @@
-image efi-part.vfat {
-  vfat {
-    file startup.nsh {
-      image = "efi-part/startup.nsh"
-    }
-    file EFI {
-      image = "efi-part/EFI"
-    }
-    file Image {
-      image = "Image"
-    }
-  }
-  size = 32M
-}
-
-image disk.img {
-  hdimage {
-    gpt = true
-  }
-
-  partition boot {
-    partition-type = 0xEF
-    image = "efi-part.vfat"
-  }
-
-  partition root {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-  }
-}
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /Image root=/dev/sda2 rootwait console=ttyAMA0
-}
@@ -1,68 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_TASKSTATS=y
-CONFIG_SCHED_AUTOGROUP=y
-CONFIG_PROFILING=y
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_COMPAT=y
-CONFIG_FW_CFG_SYSFS=y
-CONFIG_FW_CFG_SYSFS_CMDLINE=y
-CONFIG_ACPI=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BINFMT_MISC=y
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_PACKET_DIAG=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_BRIDGE=m
-CONFIG_NET_SCHED=y
-CONFIG_VSOCKETS=y
-CONFIG_PCI=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_MACVLAN=y
-CONFIG_VIRTIO_NET=y
-CONFIG_NLMON=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_VIRTIO=y
-CONFIG_TCG_TPM=y
-CONFIG_TCG_TIS=y
-CONFIG_DRM=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_MAILBOX=y
-CONFIG_PL320_MBOX=y
-CONFIG_ARM_SMMU_V3=y
-CONFIG_EXT4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_VIRTIO_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
@@ -1,32 +0,0 @@
-Intro
-=====
-
-The QEMU sbsa-ref machine is primarily meant for firmware development
-and testing according to ARM's SBSA and SBBR standards.
-
-Build
-=====
-
-  $ make qemu_aarch64_sbsa_defconfig
-  $ make
-
-Emulation
-=========
-
-Run the emulation with:
-
-  qemu-system-aarch64 \
-    -M sbsa-ref \
-    -cpu cortex-a57 \
-    -smp 4 \
-    -m 1024 \
-    -nographic \
-    -pflash output/images/SBSA_FLASH0.fd \
-    -pflash output/images/SBSA_FLASH1.fd \
-    -hda output/images/disk.img # qemu_aarch64_sbsa_defconfig
-
-Note that if you want to run sbsa-ref emulation with QEMU provided by
-your distro (i.e., not host-qemu by Buildroot) then you may need to
-install the SeaBIOS package for some required drivers. On Debian:
-
-  # apt install seabios
@@ -1,154 +0,0 @@
-From 82d91965519c20639c24aadd022b2859461562bc Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Tue, 27 Apr 2021 14:54:28 +0200
-Subject: [PATCH] sparc64: avoid stringop-overread warning to access Machine
- description datas
-
-gcc-11 warns about what appears to be an out-of-range array access but
-stop the build due to -Werror added to cflags:
-
-arch/sparc/kernel/mdesc.c: In function 'mdesc_node_by_name':
-arch/sparc/kernel/mdesc.c:647:22: error: 'strcmp' reading 1 or more bytes from a region of size 0 [-Werror=stringop-overread]
-  647 |                 if (!strcmp(names + ep[ret].name_offset, name))
-      |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-arch/sparc/kernel/mdesc.c:77:33: note: at offset 16 into source object 'mdesc' of size 16
-   77 |         struct mdesc_hdr        mdesc;
-      |                                 ^~~~~
-arch/sparc/kernel/mdesc.c: In function 'mdesc_get_property':
-arch/sparc/kernel/mdesc.c:692:22: error: 'strcmp' reading 1 or more bytes from a region of size 0 [-Werror=stringop-overread]
-  692 |                 if (!strcmp(names + ep->name_offset, name)) {
-      |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-arch/sparc/kernel/mdesc.c:77:33: note: at offset 16 into source object 'mdesc' of size 16
-   77 |         struct mdesc_hdr        mdesc;
-      |                                 ^~~~~
-arch/sparc/kernel/mdesc.c: In function 'mdesc_next_arc':
-arch/sparc/kernel/mdesc.c:719:21: error: 'strcmp' reading 1 or more bytes from a region of size 0 [-Werror=stringop-overread]
-  719 |                 if (strcmp(names + ep->name_offset, arc_type))
-      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-arch/sparc/kernel/mdesc.c:77:33: note: at offset 16 into source object 'mdesc' of size 16
-   77 |         struct mdesc_hdr        mdesc;
-      |                                 ^~~~~
-cc1: all warnings being treated as errors
-
-The issue was initially reported to gcc [1] where it was analized.
-As suggested, change the struct mdesc_elem * accesses from the end
-of mdesc to those from the beginning of the data array.
-
-Update the prototype of node_block(), name_block() and data_block()
-since the code really seems to want to do is to compute the address
-somewhere into the chunk pointed to by hp.
-
-[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100262
-
-Upstream status: Pending 
-https://www.spinics.net/lists/sparclinux/msg26385.html
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- arch/sparc/kernel/mdesc.c | 37 +++++++++++++++++++++----------------
- 1 file changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
-index 8e645ddac58e..3403555aa1e2 100644
--- a/arch/sparc/kernel/mdesc.c
-+++ b/arch/sparc/kernel/mdesc.c
-@@ -75,6 +75,7 @@ struct mdesc_handle {
- 	refcount_t		refcnt;
- 	unsigned int		handle_size;
- 	struct mdesc_hdr	mdesc;
-+	char			data[];
- };
- 
- typedef int (*mdesc_node_info_get_f)(struct mdesc_handle *, u64,
-@@ -610,26 +611,30 @@ int mdesc_get_node_info(struct mdesc_handle *hp, u64 node,
- }
- EXPORT_SYMBOL(mdesc_get_node_info);
- 
-static struct mdesc_elem *node_block(struct mdesc_hdr *mdesc)
-+static struct mdesc_elem *node_block(struct mdesc_handle *hp)
- {
-	return (struct mdesc_elem *) (mdesc + 1);
-+	return (struct mdesc_elem *) hp + offsetof(struct mdesc_handle, data);
- }
- 
-static void *name_block(struct mdesc_hdr *mdesc)
-+static void *name_block(struct mdesc_handle *hp)
- {
-	return ((void *) node_block(mdesc)) + mdesc->node_sz;
-+	struct mdesc_hdr *mdesc = &hp->mdesc;
-+
-+	return ((void *) node_block(hp)) + mdesc->node_sz;
- }
- 
-static void *data_block(struct mdesc_hdr *mdesc)
-+static void *data_block(struct mdesc_handle *hp)
- {
-	return ((void *) name_block(mdesc)) + mdesc->name_sz;
-+	struct mdesc_hdr *mdesc = &hp->mdesc;
-+
-+	return ((void *) name_block(hp)) + mdesc->name_sz;
- }
- 
- u64 mdesc_node_by_name(struct mdesc_handle *hp,
- 		       u64 from_node, const char *name)
- {
-	struct mdesc_elem *ep = node_block(&hp->mdesc);
-	const char *names = name_block(&hp->mdesc);
-+	struct mdesc_elem *ep = node_block(hp);
-+	const char *names = name_block(hp);
- 	u64 last_node = hp->mdesc.node_sz / 16;
- 	u64 ret;
- 
-@@ -657,15 +662,15 @@ EXPORT_SYMBOL(mdesc_node_by_name);
- const void *mdesc_get_property(struct mdesc_handle *hp, u64 node,
- 			       const char *name, int *lenp)
- {
-	const char *names = name_block(&hp->mdesc);
-+	const char *names = name_block(hp);
- 	u64 last_node = hp->mdesc.node_sz / 16;
-	void *data = data_block(&hp->mdesc);
-+	void *data = data_block(hp);
- 	struct mdesc_elem *ep;
- 
- 	if (node == MDESC_NODE_NULL || node >= last_node)
- 		return NULL;
- 
-	ep = node_block(&hp->mdesc) + node;
-+	ep = node_block(hp) + node;
- 	ep++;
- 	for (; ep->tag != MD_NODE_END; ep++) {
- 		void *val = NULL;
-@@ -702,8 +707,8 @@ EXPORT_SYMBOL(mdesc_get_property);
- 
- u64 mdesc_next_arc(struct mdesc_handle *hp, u64 from, const char *arc_type)
- {
-	struct mdesc_elem *ep, *base = node_block(&hp->mdesc);
-	const char *names = name_block(&hp->mdesc);
-+	struct mdesc_elem *ep, *base = node_block(hp);
-+	const char *names = name_block(hp);
- 	u64 last_node = hp->mdesc.node_sz / 16;
- 
- 	if (from == MDESC_NODE_NULL || from >= last_node)
-@@ -728,7 +733,7 @@ EXPORT_SYMBOL(mdesc_next_arc);
- 
- u64 mdesc_arc_target(struct mdesc_handle *hp, u64 arc)
- {
-	struct mdesc_elem *ep, *base = node_block(&hp->mdesc);
-+	struct mdesc_elem *ep, *base = node_block(hp);
- 
- 	ep = base + arc;
- 
-@@ -738,8 +743,8 @@ EXPORT_SYMBOL(mdesc_arc_target);
- 
- const char *mdesc_node_name(struct mdesc_handle *hp, u64 node)
- {
-	struct mdesc_elem *ep, *base = node_block(&hp->mdesc);
-	const char *names = name_block(&hp->mdesc);
-+	struct mdesc_elem *ep, *base = node_block(hp);
-+	const char *names = name_block(hp);
- 	u64 last_node = hp->mdesc.node_sz / 16;
- 
- 	if (node == MDESC_NODE_NULL || node >= last_node)
-- 
-2.30.2
-
@@ -1,30 +0,0 @@
-image boot.vfat {
-  vfat {
-    files = {
-      "bcm2711-rpi-cm4.dtb",
-      "rpi-firmware/cmdline.txt",
-      "rpi-firmware/config.txt",
-      "rpi-firmware/fixup.dat",
-      "rpi-firmware/start.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"
-  }
-}
@@ -1,30 +0,0 @@
-image boot.vfat {
-  vfat {
-    files = {
-      "bcm2711-rpi-cm4.dtb",
-      "rpi-firmware/cmdline.txt",
-      "rpi-firmware/config.txt",
-      "rpi-firmware/fixup.dat",
-      "rpi-firmware/start.elf",
-      "rpi-firmware/overlays",
-      "zImage"
-    }
-  }
-  size = 32M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext4"
-  }
-}
@@ -16,7 +16,7 @@ do
 			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"

 # fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
-dtoverlay=miniuart-bt,krnbt=on
+dtoverlay=miniuart-bt
 __EOF__
 		fi
 		;;
@@ -9,7 +9,6 @@ These instructions apply to all models of the Raspberry Pi:
  - the model B2 (aka Raspberry Pi 2)
  - the model B3 (aka Raspberry Pi 3).
  - the model B4 (aka Raspberry Pi 4).
-  - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board).

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

  $ make raspberrypi3_defconfig

-or for model 3 B and B+ (64 bit):
-
-  $ make raspberrypi3_64_defconfig
-
 For model 4 B:

  $ make raspberrypi4_defconfig

-or for model 4 B (64 bit):
-
-  $ make raspberrypi4_64_defconfig
-
-For model CM4 (on IO Board):
-
-  $ make raspberrypicm4io_defconfig
-
-or for CM4 (on IO Board - 64 bit):
-
-  $ make raspberrypicm4io_64_defconfig
-
 Build the rootfs
 ----------------

@@ -80,7 +63,6 @@ After building, you should obtain this tree:
    +-- bcm2710-rpi-3-b.dtb         [1]
    +-- bcm2710-rpi-3-b-plus.dtb    [1]
    +-- bcm2711-rpi-4-b.dtb         [1]
-    +-- bcm2711-rpi-cm4.dtb         [1]
    +-- boot.vfat
    +-- rootfs.ext4
    +-- rpi-firmware/
@@ -115,31 +97,3 @@ Insert the SDcard into your Raspberry Pi, and power it up. Your new system
 should come up now and start two consoles: one on the serial port on
 the P1 header, one on the HDMI output where you can login using a USB
 keyboard.
-
-How to write to CM4 eMMC memory
-===============================
-
-For CM4 modules without eMMC memory see above for booting from SD card,
-for CM4 moduels with eMMC memory proceed as following:
-
- fit jumper on IO Board header J2 to disable eMMC boot
- connect IO Board micro USB port (J11 USB slave) to your host linux system
- power up CM4/IO Board (lsusb command should show a '0a5c:2711 Broadcom Corp.
-  BCM2711 Boot' device)
- run 'sudo ./host/bin/rpiboot', output should look like the following:
-    Waiting for BCM2835/6/7/2711...
-    Loading embedded: bootcode4.bin
-    Sending bootcode.bin
-    Successful read 4 bytes
-    Waiting for BCM2835/6/7/2711...
-    Loading embedded: bootcode4.bin
-    Second stage boot server
-    Loading embedded: start4.elf
-    File read: start4.elf
-    Second stage boot server done
-
- a USB mass storage device should show up (the CM4 eMMC memory), proceed
-  as described above to copy sdcard.img to it
- power down CM4/IO Board
- remove jumper on IO Board header J2 to re-enable eMMC boot
- power up CM4/IO Board
@@ -1 +0,0 @@
-raspberrypi
@@ -1 +0,0 @@
-raspberrypi
@@ -1,28 +0,0 @@
-From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba6..24af549977 100644
--- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
-YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
-- 
-2.20.1
-
@@ -0,0 +1,7 @@
+setenv finduuid "part uuid mmc 1:1 uuid"
+run finduuid
+run findfdt
+setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4"
+load mmc 1:1 ${fdt_addr} boot/${fdtfile}
+load mmc 1:1 ${loadaddr} boot/zImage
+bootz ${loadaddr} - ${fdt_addr}
@@ -0,0 +1,29 @@
+# Minimal SD card image for the MX6 Cubox/Hummingboard
+#
+# U-Boot SPL and u-boot.img are flashed in the first 1MB raw partition.
+# A single root filesystem partition is used (Ext4 in this case).
+#
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1K
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.img"
+		offset = 69K
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		offset = 1M
+		size = 512M
+	}
+}
@@ -1,29 +0,0 @@
-From 96db7c072b96f9b7a1d9a986eff20353f7459004 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <festevam@gmail.com>
-Date: Sun, 18 Jul 2021 19:08:36 -0300
-Subject: [PATCH] mx6cuboxi: Fix the mmc device for the rootfs
-
-After the comversion to DM_MMC, the rootfs is mmc 1, so
-adjust it accordingly.
-
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
- include/configs/mx6cuboxi.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
-index 55717c77ab38..1a06f29b8c17 100644
--- a/include/configs/mx6cuboxi.h
-+++ b/include/configs/mx6cuboxi.h
-@@ -57,7 +57,7 @@
- 	"console=" CONSOLE_DEV ",115200\0" \
- 	"bootm_size=0x10000000\0" \
- 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-	"finduuid=part uuid mmc 0:1 uuid\0" \
-+	"finduuid=part uuid mmc 1:1 uuid\0" \
- 	"update_sd_firmware=" \
- 		"if test ${ip_dyn} = yes; then " \
- 			"setenv get_cmd dhcp; " \
-- 
-2.25.1
-
@@ -1,40 +0,0 @@
-From ab1dd9332c379164925aee755a013dbd8839501b Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <festevam@gmail.com>
-Date: Mon, 19 Jul 2021 16:48:07 -0300
-Subject: [PATCH 2/2] mx6cuboxi: Fix the console variable
-
-Do not pass the console baudrate to the 'console' variable
-to avoid the baudrate being passed twice when using extlinux.conf:
-
-cat /proc/cmdline
-root=PARTUUID=00000000-01 rootwait rw console=ttymxc0,115200,115200
-
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
- include/configs/mx6cuboxi.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
-index 1a06f29b8c17..9e5083b0d876 100644
--- a/include/configs/mx6cuboxi.h
-+++ b/include/configs/mx6cuboxi.h
-@@ -38,7 +38,6 @@
- /* Command definition */
- 
- #define CONFIG_MXC_UART_BASE	UART1_BASE
-#define CONSOLE_DEV	"ttymxc0"
- 
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
-@@ -54,7 +53,7 @@
- 	"ramdiskaddr=0x13000000\0" \
- 	"initrd_high=0xffffffff\0" \
- 	"ip_dyn=yes\0" \
-	"console=" CONSOLE_DEV ",115200\0" \
-+	"console=ttymxc0\0" \
- 	"bootm_size=0x10000000\0" \
- 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- 	"finduuid=part uuid mmc 1:1 uuid\0" \
-- 
-2.25.1
-
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -d -m 755 $TARGET_DIR/boot
+
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
+	-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr
@@ -0,0 +1,14 @@
+#!/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}"
@@ -1,4 +0,0 @@
-Label imx6qdl-cubox Buildroot
-	kernel ../zImage
-	fdtdir ../
-	append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate} 
@@ -13,7 +13,6 @@ image sdcard.img {

 	partition ssbl {
 		image = "u-boot.stm32"
-		size = 2M
 	}

 	partition rootfs {
@@ -0,0 +1 @@
+# CONFIG_STM32MP_WATCHDOG is not set
@@ -0,0 +1 @@
+# CONFIG_STM32MP_WATCHDOG is not set
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-global.bootm.oftree="/boot/socfpga_cyclone5_de0_nano_soc.dtb"
-global.bootm.image="/boot/zImage"
-
-#bootargs-ip
-
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rw rootwait"
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# SD card slot, first partition
-mkdir -p /mnt/mmcblk0p2
-automount -d /mnt/mmcblk0p2 'mount /dev/mmc0.1 /mnt/mmcblk0p2'
@@ -1 +0,0 @@
-mmc
@@ -1 +0,0 @@
-console=ttyS0,115200
@@ -1,42 +0,0 @@
-image boot.vfat {
-	vfat {
-		file zImage {
-			image = "zImage"
-		}
-
-		file socfpga_cyclone5_de0_nano_soc.dtb {
-			image = "socfpga_cyclone5_de0_nano_soc.dtb"
-		}
-
-		file barebox.bin {
-			image = "barebox-socfpga-de10_nano.img"
-		}
-
-		file barebox.env {
-			image = "barebox-env"
-		}
-	}
-	size = 8M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition spl {
-		partition-type = 0xa2
-		image = "barebox-socfpga-de10_nano-xload.img"
-		size = 1M
-	}
-
-	partition boot {
-		partition-type = 0xc
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
-}
@@ -1,41 +0,0 @@
-Terasic DE10 Nano Development Board
-
-Intro
-=====
-
-More information about this board can be found here:
-https://rocketboards.org/foswiki/Documentation/DE10NanoDevelopmentBoard
-
-Build
-=====
-
-First, load socrates config for buildroot
-
-    make terasic_de10nano_cyclone5_defconfig
-
-Build everything
-
-    make
-
-Following files will be generated in output/images
-
-.
-├── barebox-env
-├── barebox-socfpga-de10_nano.img
-├── barebox-socfpga-de10_nano-xload.img
-├── boot.vfat
-├── rootfs.ext2
-├── rootfs.ext4 -> rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-├── socfpga_cyclone5_de0_nano_soc.dtb
-└── zImage
-
-Creating bootable SD card
-=========================
-
-Simply invoke
-
-dd if=output/images/sdcard.img of=/dev/sdX
-
-Where X is your SD card device (not partition)
@@ -1,26 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"MLO",
-			"u-boot.img"
-		}
-	}
-	size = 8M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}
@@ -1,40 +0,0 @@
-OMAP5432 uEVM
-=============
-
-This file documents the Buildroot support for the OMAP5432 uEVM[1], a
-single-board computer development platform based on the Texas Instruments
-OMAP5432 system on a chip (SoC).
-
-How to build
-============
-
-  $ make uevm5432_defconfig
-  $ 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
-  $ sync
-
-Where /dev/sdX is the device node of your SD card (may be /dev/mmcblkX instead
-depending on setup).
-
-To boot from SD card, set the SYSBOOT switches S1 of your OMAP5432 uEVM to the
-following position:
-
-  ON   x   x
-     x   x
-     1 2 3 4
-
-Insert the micro SDcard in your OMAP5432 uEVM, and power it up with the POWER
-ON push button switch S3. The console is on the micro USB Debug UART, with
-serial settings 115200 8N1. Refer also to the quick start guide[2].
-
-[1]: https://svtronics.com/5432
-[2]: https://www.ti.com/lit/ug/swcu131/swcu131.pdf
@@ -0,0 +1,7 @@
+setenv finduuid "part uuid mmc 0:1 uuid"
+run finduuid
+run findfdt
+setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4"
+load mmc 0:1 ${fdt_addr} boot/${fdtfile}
+load mmc 0:1 ${loadaddr} boot/zImage
+bootz ${loadaddr} - ${fdt_addr}
@@ -0,0 +1,32 @@
+# Minimal SD card image for the Wandboard
+#
+# The SD card must have at least 1 MB free at the beginning.
+# U-Boot and its environment are dumped as is.
+# A single root filesystem partition is required (Ext4 in this case).
+#
+# For details about the layout, see:
+# http://wiki.wandboard.org/index.php/Boot-process
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition spl {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1024
+  }
+
+  partition u-boot {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 70656
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+    offset = 1M
+    size = 512M
+  }
+}
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -d -m 755 $TARGET_DIR/boot
+
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
+	-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr
@@ -1,4 +0,0 @@
-Label imx6qdl-wandboard Buildroot
-	kernel ../zImage
-	fdtdir ../
-	append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate} 
@@ -1,68 +0,0 @@
-From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001
-From: Deepika Bhavnani <deepika.bhavnani@arm.com>
-Date: Thu, 15 Aug 2019 00:56:46 +0300
-Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
-
-GCC diagnostics were added to ignore array boundaries, instead
-of ignoring GCC warning current code will check for array boundaries
-and perform and array update only for valid elements.
-
-Resolves: `CID 246574` `CID 246710` `CID 246651`
-
-Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
-Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
-
-Backported from: 41af05154abe136938bcfb5f26c969933784bbef
-[Adapted to apply on 1.5]
-
---
- lib/psci/psci_common.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c
-index 2220a745cd6e..6282d992a2f0 100644
--- a/lib/psci/psci_common.c
-+++ b/lib/psci/psci_common.c
-@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void)
- /******************************************************************************
-  * Helper function to update the requested local power state array. This array
-  * does not store the requested state for the CPU power level. Hence an
- * assertion is added to prevent us from accessing the wrong index.
-+ * assertion is added to prevent us from accessing the CPU power level.
-  *****************************************************************************/
- static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
- 					 unsigned int cpu_idx,
- 					 plat_local_state_t req_pwr_state)
- {
-	/*
-	 * This should never happen, we have this here to avoid
-	 * "array subscript is above array bounds" errors in GCC.
-	 */
- 	assert(pwrlvl > PSCI_CPU_PWR_LVL);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
-	psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
-#pragma GCC diagnostic pop
-+	if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
-+			(cpu_idx < PLATFORM_CORE_COUNT)) {
-+		psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
-+	}
- }
- 
- /******************************************************************************
-@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl,
- {
- 	assert(pwrlvl > PSCI_CPU_PWR_LVL);
- 
-	return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
-+	if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
-+			(cpu_idx < PLATFORM_CORE_COUNT)) {
-+		return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
-+	} else
-+		return NULL;
- }
- 
- /*
-- 
-2.34.0
-
@@ -10,7 +10,6 @@ source "boot/beaglev-ddrinit/Config.in"
 source "boot/beaglev-secondboot/Config.in"
 source "boot/binaries-marvell/Config.in"
 source "boot/boot-wrapper-aarch64/Config.in"
-source "boot/edk2/Config.in"
 source "boot/grub2/Config.in"
 source "boot/gummiboot/Config.in"
 source "boot/lpc32xxcdl/Config.in"
@@ -1,7 +1,7 @@
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE
 	bool "ARM Trusted Firmware (ATF)"
 	depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \
-		   (BR2_TARGET_UBOOT || BR2_TARGET_EDK2)
+		   BR2_TARGET_UBOOT
 	help
 	  Enable this option if you want to build the ATF for your ARM
 	  based embedded device.
@@ -15,7 +15,7 @@ choice
 	  Select the specific ATF version you want to use

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
-	bool "v2.5"
+	bool "v2.4"

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION
 	bool "Custom version"
@@ -43,7 +43,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
-	default "v2.5"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
+	default "v2.4"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
@@ -135,19 +135,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE

 endif

-config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
-	bool "Use EDK2 as BL33"
-	depends on BR2_TARGET_EDK2
-	help
-	  This option allows to embed EDK2 as the BL33 part of
-	  the ARM Trusted Firmware. It ensures that the EDK2 package
-	  gets built before ATF, and that the appropriate BL33
-	  variable pointing to the EDK2 is passed when building ATF.
-
-	  Do not choose this option if you intend to build ATF and EDK2
-	  for the 'qemu_sbsa' platform. In this case, due to the EDK2
-	  build system, the dependency between ATF and EDK is reversed.
-
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS
 	string "Additional ATF make targets"
 	help
@@ -204,10 +191,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL
 	string
-	# While newer versions of TF-A support "none" as
-	# ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only
-	# supported "0" to disable SSP.
-	default "0"    	  if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
+	default "none"    if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP
 	default "default" if BR2_SSP_REGULAR
 	default "strong"  if BR2_SSP_STRONG
 	default "all"     if BR2_SSP_ALL
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  d12a824afcc5cb90d005f9820f3274f1319cef1bb282e40a6a190b75900206d3  arm-trusted-firmware-v2.5.tar.gz
-sha256  0171b0795501ee90634fbc4a7835e2fb215d9423daf1cf5b0d0682adde12c597  docs/license.rst
+sha256  4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d  arm-trusted-firmware-v2.4.tar.gz
+sha256  487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164  license.rst
@@ -18,10 +18,10 @@ else
 # Handle stable official ATF versions
 ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION))
 # The licensing of custom or from-git versions is unknown.
-# This is valid only for the latest (i.e. known) version.
+# This is valid only for the official v1.4.
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y)
 ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
-ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst
+ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst
 endif
 endif

@@ -51,10 +51,7 @@ endif
 ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
-	PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
-
-ARM_TRUSTED_FIRMWARE_MAKE_ENV += \
-	$(TARGET_MAKE_ENV) \
+	PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
 	ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL))

 ifeq ($(BR2_ARM_CPU_ARMV7A),y)
@@ -83,15 +80,6 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee
 endif
 endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE

-ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y)
-ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2
-# Since the flash device name vary between platforms, we use the variable
-# provided by the EDK2 package for this. Using this variable here is OK
-# as it will expand after all dependencies are resolved, inside _BUILD_CMDS.
-ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
-	BL33=$(BINARIES_DIR)/$(call qstrip,$(BR2_TARGET_EDK2_FD_NAME).fd)
-endif
-
 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)
@@ -167,8 +155,7 @@ ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \

 define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
 	$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
-	$(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
 		$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
 	$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
 endef
@@ -1,5 +1,5 @@
 config BR2_TARGET_AT91BOOTSTRAP3
-	bool "AT91 Bootstrap 3+"
+	bool "AT91 Bootstrap 3"
 	depends on BR2_arm926t || BR2_cortex_a5 || BR2_cortex_a7
 	help
 	  AT91Bootstrap is a first level bootloader for the Atmel AT91
@@ -16,13 +16,10 @@ if BR2_TARGET_AT91BOOTSTRAP3

 choice

-	prompt "AT91 Bootstrap 3+ version"
+	prompt "AT91 Bootstrap 3 version"

 config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
-	bool "4.0.0"
-
-config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X
-	bool "3.10.3"
+	bool "3.9.3"

 config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT
 	bool "Custom Git repository"
@@ -54,8 +51,7 @@ endif

 config BR2_TARGET_AT91BOOTSTRAP3_VERSION
 	string
-	default "v4.0.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION
-	default "v3.10.3" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X
+	default "v3.9.3" 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
@@ -100,12 +96,4 @@ config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE
 	help
 	  Path to the at91bootstrap3 configuration file

-config BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3
-	bool "needs host-python3"
-	help
-	  Enable this option if the at91bootstrap build process needs
-	  Python 3.x to be available on the host. This is needed in
-	  some at91bootstrap configurations to use NAND/PMECC Python
-	  scripts.
-
 endif # BR2_TARGET_AT91BOOTSTRAP3
@@ -1,4 +1,3 @@
 # Locally calculated
-sha256  b6ae5bcaacc5a949f400182e036ae053049638444a3ba8b1dd154ec5f7898d8e  at91bootstrap3-v3.10.3.tar.gz
-sha256  08c5b95df28be7f2e0439fb2b77fe27524f97c499850641e4540c07ea0b2c25d  at91bootstrap3-v4.0.0.tar.gz
-sha256  5a3809b1c2ba13b7242572322951311c584419f1f8516f665d6c06f0668d78de  LICENSES/MIT.txt
+sha256  dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1  at91bootstrap3-v3.9.3.tar.gz
+sha256  fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a  main.c
@@ -19,11 +19,9 @@ else
 AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION))
 endif

-ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y)
-AT91BOOTSTRAP3_LICENSE = MIT
-AT91BOOTSTRAP3_LICENSE_FILES = LICENSES/MIT.txt
-else ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION_3X),y)
 AT91BOOTSTRAP3_LICENSE = Atmel License
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y)
+AT91BOOTSTRAP3_LICENSE_FILES = main.c
 endif

 AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam
@@ -32,10 +30,6 @@ AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap
 AT91BOOTSTRAP3_INSTALL_IMAGES = YES
 AT91BOOTSTRAP3_INSTALL_TARGET = NO

-ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_NEEDS_PYTHON3),y)
-AT91BOOTSTRAP3_DEPENDENCIES += host-python3
-endif
-
 AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \
 	$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))

@@ -54,7 +48,7 @@ define AT91BOOTSTRAP3_BUILD_CMDS
 endef

 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
-	cp $(wildcard $(@D)/build/binaries/*.bin $(@D)/binaries/*.bin) $(BINARIES_DIR)
+	cp $(@D)/binaries/*.bin $(BINARIES_DIR)
 endef

 ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_USE_DEFCONFIG),y)
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2021.07.0"
+	bool "2021.01.0"

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

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2021.07.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2021.01.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
@@ -1,8 +1,8 @@
-# From https://www.barebox.org/download/barebox-2021.07.0.tar.bz2.md5
-md5  df3651a395e1420c2818dd464c63069d  barebox-2021.07.0.tar.bz2
+# From https://www.barebox.org/download/barebox-2021.01.0.tar.bz2.md5
+md5  e81e7cd6bc2629e7fcdeaddf59c324c3  barebox-2021.01.0.tar.bz2

 # Locally calculated
-sha256  ce5d9d8953a2e3c21f1e6a72b1499962170bb41c4750ce8129ef44bf7860992d  barebox-2021.07.0.tar.bz2
+sha256  b39501db1c701b05f862973d8aed628cab0e611421cbaadae8b5262311551ff9  barebox-2021.01.0.tar.bz2

 # License files, locally computed
 sha256  ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4  COPYING
@@ -4,5 +4,10 @@
 #
 ################################################################################

+define BAREBOX_HELP_CMDS
+	@echo '  barebox-menuconfig     - Run barebox menuconfig'
+	@echo '  barebox-savedefconfig  - Run barebox savedefconfig'
+endef
+
 # Instantiate the barebox package
 $(eval $(barebox-package))
@@ -1,3 +1,2 @@
 # Locally computed
-sha256  2d491f64bd77de9dfd4b8ae6c00e83670e80c205cc20917fefa6194b1dc1fe4e  beaglev-ddrinit-c0839f25246d9e308c23498d344ca13d8a7ad6ed.tar.gz
-sha256  284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813  LICENSE
+sha256  df58c3da7a6f429095f4d56e7f1f5b7c855a0cbe82a2569586ce0c5fdd1bf256  beaglev-ddrinit-2e2f6faaf1059b61bb06ea00404199d1de55f201.tar.gz
@@ -5,13 +5,14 @@
 ################################################################################

 # Commit on the 'starfive' branch
-BEAGLEV_DDRINIT_VERSION = c0839f25246d9e308c23498d344ca13d8a7ad6ed
+BEAGLEV_DDRINIT_VERSION = 2e2f6faaf1059b61bb06ea00404199d1de55f201
 BEAGLEV_DDRINIT_SITE = $(call github,starfive-tech,beagle_ddrinit,$(BEAGLEV_DDRINIT_VERSION))
 BEAGLEV_DDRINIT_INSTALL_TARGET = NO
 BEAGLEV_DDRINIT_INSTALL_IMAGES = YES
 BEAGLEV_DDRINIT_DEPENDENCIES = host-riscv64-elf-toolchain
+# unfortunately, no real license file, but several sources files are
+# under GPL-2.0+, making the whole work GPL-2.0+
 BEAGLEV_DDRINIT_LICENSE = GPL-2.0+
-BEAGLEV_DDRINIT_LICENSE_FILES = LICENSE

 define BEAGLEV_DDRINIT_BUILD_CMDS
 	$(MAKE) -C $(@D)/build \
@@ -1,3 +1,2 @@
 # Locally computed
-sha256  fe4d37f3ff38e7f2da70a08f9cb1668c0b928e85d2e0935bd985f910b3ce30e9  beaglev-secondboot-2d20047960044308126117ad56bc08a1164e82b2.tar.gz
-sha256  284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813  LICENSE
+sha256  56519b20a8ac2b68770cacd5158190dfcb2b3762a759b1c44582ca25ffbccc5d  beaglev-secondboot-e976d186e69a1a84884265b0689626fa254a950d.tar.gz
@@ -5,13 +5,14 @@
 ################################################################################

 # Commit on the 'starfive' branch
-BEAGLEV_SECONDBOOT_VERSION = 2d20047960044308126117ad56bc08a1164e82b2
+BEAGLEV_SECONDBOOT_VERSION = e976d186e69a1a84884265b0689626fa254a950d
 BEAGLEV_SECONDBOOT_SITE = $(call github,starfive-tech,beagle_secondBoot,$(BEAGLEV_SECONDBOOT_VERSION))
 BEAGLEV_SECONDBOOT_INSTALL_TARGET = NO
 BEAGLEV_SECONDBOOT_INSTALL_IMAGES = YES
 BEAGLEV_SECONDBOOT_DEPENDENCIES = host-riscv64-elf-toolchain
+# unfortunately, no real license file, but several sources files are
+# under GPL-2.0+, making the whole work GPL-2.0+
 BEAGLEV_SECONDBOOT_LICENSE = GPL-2.0+
-BEAGLEV_SECONDBOOT_LICENSE_FILES = LICENSE

 define BEAGLEV_SECONDBOOT_BUILD_CMDS
 	$(MAKE) -C $(@D)/build \
@@ -1,108 +0,0 @@
-config BR2_TARGET_EDK2
-	bool "EDK2"
-	depends on BR2_x86_64 || BR2_aarch64
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
-	select BR2_PACKAGE_EDK2_PLATFORMS
-	help
-	  EDK II is a modern, feature-rich, cross-platform firmware
-	  development environment for the UEFI and PI specifications.
-
-	  https://github.com/tianocore/tianocore.github.io/wiki/EDK-II
-
-if BR2_TARGET_EDK2
-
-choice
-	prompt "Platform"
-	default BR2_TARGET_EDK2_PLATFORM_OVMF_X64 if BR2_x86_64
-	default BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU if BR2_aarch64
-
-config BR2_TARGET_EDK2_PLATFORM_OVMF_X64
-	bool "x86-64"
-	depends on BR2_x86_64
-	help
-	  Platform configuration for a generic x86-64 target.
-	  This platform will boot from flash address 0x0.
-	  It should therefore be used as the first bootloader.
-
-config BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU
-	bool "ARM Virt Qemu (flash)"
-	depends on BR2_aarch64
-	help
-	  Platform configuration for QEMU targeting the Virt machine.
-	  This platform will only boot from flash address 0x0.
-	  It should therefore be used as the first bootloader.
-
-config BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL
-	bool "ARM Virt Qemu (kernel)"
-	depends on BR2_aarch64
-	help
-	  Platform configuration for QEMU targeting the Virt machine.
-	  This platform can boot from either flash address 0x0 or via
-	  the Linux boot protocol. It can therefore be loaded by a
-	  previous bootloader like ARM Trusted Firmware or OP-TEE.
-
-config BR2_TARGET_EDK2_PLATFORM_ARM_SGI575
-	bool "ARM SGI-575"
-	depends on BR2_aarch64
-	help
-	  Platform configuration for ARM SGI-575 on ARM's
-	  Fixed Virtual Platform (FVP).
-
-config BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64
-	bool "ARM VExpress FVP Aarch64"
-	depends on BR2_aarch64
-	help
-	  Platform configuration for ARM Versatile Express targeting
-	  the Aarch64 Fixed Virtual Platform (FVP).
-
-config BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX
-	bool "Socionext DeveloperBox"
-	depends on BR2_aarch64
-	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
-	depends on !BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
-	select BR2_PACKAGE_HOST_DTC
-	select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
-	help
-	  Platform configuration for Socionext SynQuacer DeveloperBox
-	  (SC2A11).
-
-comment "Socionext DeveloperBox depends on ATF not using EDK2 as BL33"
-	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
-
-config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN
-	bool "SolidRun MacchiatoBin"
-	depends on BR2_aarch64
-	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
-	select BR2_PACKAGE_HOST_DTC
-	select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
-	help
-	  Platform configuration for the SolidRun MacchiatoBin.
-
-config BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA
-	bool "QEMU SBSA"
-	depends on BR2_aarch64
-	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
-	depends on !BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
-	help
-	  Platform configuration for QEMU targeting the SBSA reference
-	  machine.
-
-comment "QEMU SBSA depends on ATF not using EDK2 as BL33"
-	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33
-
-endchoice
-
-config BR2_TARGET_EDK2_FD_NAME
-	string
-	default "OVMF" if BR2_TARGET_EDK2_PLATFORM_OVMF_X64
-	default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU
-	default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL
-	default "BL33_AP_UEFI" if BR2_TARGET_EDK2_PLATFORM_ARM_SGI575
-	default "FVP_AARCH64_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64
-	default "FVP_AARCH64_EFI" if BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX
-	default "ARMADA_EFI" if BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN
-
-endif
-
-comment "EDK2 needs a toolchain w/ gcc >= 5"
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256  04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d  edk2-edk2-stable202102-br1.tar.gz
-sha256  50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80  License.txt
@@ -1,151 +0,0 @@
-################################################################################
-#
-# edk2
-#
-################################################################################
-
-EDK2_VERSION = edk2-stable202102
-EDK2_SITE = https://github.com/tianocore/edk2
-EDK2_SITE_METHOD = git
-EDK2_LICENSE = BSD-2-Clause
-EDK2_LICENSE_FILE = License.txt
-EDK2_CPE_ID_VENDOR = tianocore
-EDK2_DEPENDENCIES = edk2-platforms host-python3 host-acpica host-util-linux
-EDK2_INSTALL_TARGET = NO
-EDK2_INSTALL_IMAGES = YES
-
-ifeq ($(BR2_x86_64),y)
-EDK2_ARCH = X64
-else ifeq ($(BR2_aarch64),y)
-EDK2_ARCH = AARCH64
-endif
-
-ifeq ($(BR2_ENABLE_DEBUG),y)
-EDK2_BUILD_TYPE = DEBUG
-else
-EDK2_BUILD_TYPE = RELEASE
-endif
-
-# Build system notes.
-#
-# The EDK2 build system is rather unique, so here are a few useful notes.
-#
-# First, builds rely heavily on Git submodules to fetch various dependencies
-# into specific directory structures. It might be possible to work around this
-# and rely on Buildroot's infrastructure, but using Git submodules greatly
-# simplifies this already complicated build system.
-#
-# Second, the build system is spread across various commands and stages.
-# Therefore, all build variables needs to be exported to be available
-# accordingly. The first stage will build $(@D)/BaseTools which contains
-# various tools and scripts for the host.
-#
-# Third, where applicable, the dependency direction between EDK2 and
-# ARM Trusted Firmware (ATF) will go in different direction for different
-# platforms. Most commonly, ATF will depend on EDK2 via the BL33 payload.
-# But for some platforms (e.g. QEMU SBSA or DeveloperBox) EDK2 will package
-# the ATF images within its own build system. In such cases, intermediary
-# "EDK2 packages" will be built in $(EDK2_BUILD_PACKAGES) in order for EDK2
-# to be able to use them in subsequent build stages.
-#
-# For more information about the build setup:
-# https://edk2-docs.gitbook.io/edk-ii-build-specification/4_edk_ii_build_process_overview
-
-EDK2_GIT_SUBMODULES = YES
-EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot
-EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms
-
-ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_X64),y)
-EDK2_DEPENDENCIES += host-nasm
-EDK2_PACKAGE_NAME = OvmfPkg
-EDK2_PLATFORM_NAME = OvmfPkgX64
-EDK2_BUILD_DIR = OvmfX64
-
-else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU),y)
-EDK2_PACKAGE_NAME = ArmVirtPkg
-EDK2_PLATFORM_NAME = ArmVirtQemu
-EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH)
-
-else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL),y)
-EDK2_PACKAGE_NAME = ArmVirtPkg
-EDK2_PLATFORM_NAME = ArmVirtQemuKernel
-EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH)
-
-else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64),y)
-EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg
-EDK2_PLATFORM_NAME = ArmVExpress-FVP-AArch64
-EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)
-
-else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOCIONEXT_DEVELOPERBOX),y)
-EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware
-EDK2_PACKAGE_NAME = Platform/Socionext/DeveloperBox
-EDK2_PLATFORM_NAME = DeveloperBox
-EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)
-EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/
-EDK2_BUILD_OPTS += -D DO_X86EMU=TRUE
-EDK2_PRE_BUILD_HOOKS += EDK2_PRE_BUILD_SOCIONEXT_DEVELOPERBOX
-
-define EDK2_PRE_BUILD_SOCIONEXT_DEVELOPERBOX
-	mkdir -p $(EDK2_BUILD_PACKAGES)/Platform/Socionext/DeveloperBox
-	$(ARM_TRUSTED_FIRMWARE_DIR)/tools/fiptool/fiptool create \
-		--tb-fw $(BINARIES_DIR)/bl31.bin \
-		--soc-fw $(BINARIES_DIR)/bl31.bin \
-		--scp-fw $(BINARIES_DIR)/bl31.bin \
-		$(EDK2_BUILD_PACKAGES)/Platform/Socionext/DeveloperBox/fip_all_arm_tf.bin
-endef
-
-else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y)
-EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware
-EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin
-EDK2_PLATFORM_NAME = Armada80x0McBin
-EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH)
-EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/
-EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND
-
-else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y)
-EDK2_DEPENDENCIES += arm-trusted-firmware
-EDK2_PACKAGE_NAME = Platform/Qemu/SbsaQemu
-EDK2_PLATFORM_NAME = SbsaQemu
-EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)
-EDK2_PRE_BUILD_HOOKS += EDK2_PRE_BUILD_QEMU_SBSA
-
-define EDK2_PRE_BUILD_QEMU_SBSA
-	mkdir -p $(EDK2_BUILD_PACKAGES)/Platform/Qemu/Sbsa
-	ln -srf $(BINARIES_DIR)/{bl1.bin,fip.bin} $(EDK2_BUILD_PACKAGES)/Platform/Qemu/Sbsa/
-endef
-
-endif
-
-EDK2_BASETOOLS_OPTS = \
-	EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
-	EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)"
-
-EDK2_BUILD_ENV += \
-	WORKSPACE=$(@D) \
-	PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \
-	PYTHON_COMMAND=$(HOST_DIR)/bin/python3 \
-	IASL_PREFIX=$(HOST_DIR)/bin/ \
-	NASM_PREFIX=$(HOST_DIR)/bin/ \
-	GCC5_$(EDK2_ARCH)_PREFIX=$(TARGET_CROSS)
-
-EDK2_BUILD_OPTS += \
-	-t GCC5 \
-	-n $(BR2_JLEVEL) \
-	-a $(EDK2_ARCH) \
-	-b $(EDK2_BUILD_TYPE) \
-	-p $(EDK2_PACKAGE_NAME)/$(EDK2_PLATFORM_NAME).dsc
-
-define EDK2_BUILD_CMDS
-	mkdir -p $(EDK2_BUILD_PACKAGES)
-	export $(EDK2_BUILD_ENV) && \
-	unset ARCH && \
-	source $(@D)/edksetup.sh && \
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/BaseTools $(EDK2_BASETOOLS_OPTS) && \
-	build $(EDK2_BUILD_OPTS) all
-endef
-
-define EDK2_INSTALL_IMAGES_CMDS
-	cp -f $(@D)/Build/$(EDK2_BUILD_DIR)/$(EDK2_BUILD_TYPE)_GCC5/FV/*.fd $(BINARIES_DIR)
-endef
-
-$(eval $(generic-package))
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4  mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz
-sha256  48bb930b6fbc3f5db72e29c849b096df3868e4a6d2bdc0e2dd3365c768241cd5  ddr3_init.c
+sha256  69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78  ddr3_init.c
@@ -109,14 +109,4 @@ config BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
 	help
 	  Build OpenSBI with the U-Boot as a Payload.

-config BR2_TARGET_OPENSBI_FW_FDT_PATH
-	bool "Include U-Boot DTB in OpenSBI Payload"
-	depends on BR2_TARGET_OPENSBI_UBOOT_PAYLOAD
-	select BR2_TARGET_UBOOT_FORMAT_DTB
-	help
-	  Build OpenSBI with FW_FDT_PATH set to
-	  $(BINARIES_DIR)/u-boot.dtb. Note that CONFIG_OF_SEPARATE
-	  must be set in the U-Boot configuration for this file to be
-	  produced.
-
 endif
@@ -46,9 +46,6 @@ endif
 ifeq ($(BR2_TARGET_OPENSBI_UBOOT_PAYLOAD),y)
 OPENSBI_DEPENDENCIES += uboot
 OPENSBI_MAKE_ENV += FW_PAYLOAD_PATH="$(BINARIES_DIR)/u-boot.bin"
-ifeq ($(BR2_TARGET_OPENSBI_FW_FDT_PATH),y)
-OPENSBI_MAKE_ENV += FW_FDT_PATH="$(BINARIES_DIR)/u-boot.dtb"
-endif
 endif

 define OPENSBI_BUILD_CMDS
@@ -1,56 +0,0 @@
-From 82becbadd5918ed7ad3c2b651ce479084b5feb2a Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Mon, 10 May 2021 15:58:41 +0200
-Subject: core: zlib: fix build warning when _LFS64_LARGEFILE is not defined
-
-In zlib, _LFS64_LARGEFILE is expected to be a boolean directive, either
-1 (true) or 0 (false). Depending on toolchain version and directives
-build may produces warnings (as shown below with gcc 9.3) when the macro
-is not defined hence this change to default it to value 0 (false).
-
-core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef]
-  196 |     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-      |                                       ^~~~~~~~~~~~~~~~
-In file included from core/lib/zlib/adler32.c:9:
-core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef]
-  196 |     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-      |                                       ^~~~~~~~~~~~~~~~
-  CC      out/core/lib/zlib/zutil.o
-In file included from core/lib/zlib/inftrees.c:7:
-core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef]
-  196 |     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-      |                                       ^~~~~~~~~~~~~~~~
-In file included from core/lib/zlib/inflate.c:84:
-core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef]
-  196 |     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-      |                                       ^~~~~~~~~~~~~~~~
-In file included from core/lib/zlib/zutil.c:9:
-core/lib/zlib/zutil.h:196:39: warning: "_LFS64_LARGEFILE" is not defined, evaluates to 0 [-Wundef]
-  196 |     (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-      |                                       ^~~~~~~~~~~~~~~~
-
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
---
- core/lib/zlib/zconf.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/core/lib/zlib/zconf.h b/core/lib/zlib/zconf.h
-index 0bca18be..a7d13741 100644
--- a/core/lib/zlib/zconf.h
-+++ b/core/lib/zlib/zconf.h
-@@ -487,6 +487,11 @@ typedef uLong FAR uLongf;
- #  endif
- #endif
- 
-+/* Other places expect _LFS64_LARGEFILE to be defined with a valid value */
-+#ifndef _LFS64_LARGEFILE
-+#define _LFS64_LARGEFILE	0
-+#endif
-+
- #if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
- #  define Z_LFS64
- #endif
-- 
-2.17.1
-
@@ -18,7 +18,7 @@ choice
 	  Select the version of OP-TEE OS you want to use

 config BR2_TARGET_OPTEE_OS_LATEST
-	bool "3.13.0"
+	bool "3.12.0"
 	help
 	  Use the latest release tag from the OP-TEE OS official Git
 	  repository.
@@ -50,7 +50,7 @@ endif

 config BR2_TARGET_OPTEE_OS_VERSION
 	string
-	default "3.13.0"	if BR2_TARGET_OPTEE_OS_LATEST
+	default "3.12.0"	if BR2_TARGET_OPTEE_OS_LATEST
 	default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_OPTEE_OS_CUSTOM_GIT

@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.13.0/optee-os-3.13.0.tar.gz
-sha256 c6629ba54f62a2624299f7d17cf6df2dadc902e6a862c62f85d1b6da6c909c3f  optee-os-3.13.0.tar.gz
+# From https://github.com/OP-TEE/optee_os/archive/3.12.0/optee-os-3.12.0.tar.gz
+sha256 b13991099f25d00dac479db93b55034cb93d206e296f2c7aa9c42b92bca2c783  optee-os-3.12.0.tar.gz
 # Locally computed
 sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a  LICENSE
@@ -14,12 +14,7 @@ SYSLINUX_LICENSE_FILES = COPYING
 SYSLINUX_INSTALL_IMAGES = YES

 # host-util-linux needed to provide libuuid when building host tools
-SYSLINUX_DEPENDENCIES = \
-	host-nasm \
-	host-python3 \
-	host-upx \
-	host-util-linux \
-	util-linux
+SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux host-util-linux

 ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y)
 SYSLINUX_TARGET += bios
@@ -60,13 +55,10 @@ define SYSLINUX_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE1) \
 		CC="$(TARGET_CC)" \
 		LD="$(TARGET_LD)" \
-		OBJCOPY="$(TARGET_OBJCOPY)" \
-		AS="$(TARGET_AS)" \
 		NASM="$(HOST_DIR)/bin/nasm" \
 		CC_FOR_BUILD="$(HOSTCC)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
-		PYTHON=$(HOST_DIR)/bin/python3 \
 		$(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)
 endef

@@ -41,7 +41,7 @@ choice
 	  Select the specific U-Boot version you want to use

 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2021.07"
+	bool "2021.04"

 config BR2_TARGET_UBOOT_CUSTOM_VERSION
 	bool "Custom version"
@@ -85,7 +85,7 @@ endif

 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2021.07"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2021.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -252,9 +252,6 @@ config BR2_TARGET_UBOOT_FORMAT_BIN
 	bool "u-boot.bin"
 	default y

-config BR2_TARGET_UBOOT_FORMAT_DTB
-	bool "u-boot.dtb"
-
 config BR2_TARGET_UBOOT_FORMAT_DTB_BIN
 	bool "u-boot-dtb.bin"

@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e  u-boot-2021.07.tar.bz2
+sha256  0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a  u-boot-2021.04.tar.bz2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
@@ -48,10 +48,6 @@ ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y)
 UBOOT_BINS += u-boot.bin
 endif

-ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB),y)
-UBOOT_BINS += u-boot.dtb
-endif
-
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
 UBOOT_BINS += u-boot
 # To make elf usable for debuging on ARC use special target
@@ -296,6 +292,12 @@ UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
 # override again. In addition, host-ccache is not ready at kconfig
 # time, so use HOSTCC_NOCCACHE.
 UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS=""
+define UBOOT_HELP_CMDS
+	@echo '  uboot-menuconfig       - Run U-Boot menuconfig'
+	@echo '  uboot-savedefconfig    - Run U-Boot savedefconfig'
+	@echo '  uboot-update-defconfig - Save the U-Boot configuration to the path specified'
+	@echo '                             by BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE'
+endef
 endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY

 UBOOT_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH))
@@ -500,11 +502,7 @@ UBOOT_DEPENDENCIES += \
 $(eval $(generic-package))
 else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y)
 UBOOT_MAKE_ENV = $(TARGET_MAKE_ENV)
-# Starting with 2021.10, the kconfig in uboot calls the cross-compiler
-# to check its capabilities. So we need the toolchain before we can
-# call the configurators.
-UBOOT_KCONFIG_DEPENDENCIES += \
-	toolchain \
+UBOOT_KCONFIG_DEPENDENCIES = \
 	$(BR2_MAKE_HOST_DEPENDENCY) \
 	$(BR2_BISON_HOST_DEPENDENCY) \
 	$(BR2_FLEX_HOST_DEPENDENCY)
--- a/Show More
+++ b/Show More