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
3188 changed files with 28366 additions and 34028 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:20210922.2200
+image: buildroot/base:20200814.2228

 stages:
  - generate-gitlab-ci
@@ -11,11 +11,8 @@ generate-gitlab-ci-yml:
  stage: generate-gitlab-ci
  script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml
  artifacts:
-    when: always
    paths:
      - generated-gitlab-ci.yml
-      - br-test-pkg/*/.config
-      - br-test-pkg/*/missing.config

 buildroot-pipeline:
  stage: build
@@ -24,5 +21,3 @@ buildroot-pipeline:
      - artifact: generated-gitlab-ci.yml
        job: generate-gitlab-ci-yml
    strategy: depend
-  variables:
-    PARENT_PIPELINE_ID: $CI_PIPELINE_ID
@@ -1,348 +1,3 @@
-2021.11-rc3, released November 30th, 2021
-
-	Fixes all over the tree.
-
-	Defconfigs: Nitrogen8mp: Fix Linux build, Zynqmp-zxu106: Fix
-	ATF build
-
-	Updated/fixed packages: asterisk, automake, gdb, glorytun,
-	gmp, hackrf, libgee, libglib2, libmodsecurity, libosmium,
-	libressl, lighttpd, linux, micropython, mosquitto, mtd,
-	nfs-utils, nss-myhostname, pcre, php, poco, pure-ftpd,
-	python-cycler, qemu, qdecoder, smack, smcroute, spidev_test,
-	strace, syslinux, toolchain, uboot, uhd, vim, websocketpp,
-	wireshark, xcursor-transparent-theme, xscreensaver,
-	xtables-addons
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14346: BR2_PACKAGE_NFS_UTILS_RPC_NFSD does not patch CONFIG_NFSD..
-
-2021.11-rc2, released November 19th, 2021
-
-	Fixes all over the tree.
-
-	Coding style fixes for a large number of board genimage
-	configuration files for clarity and consistency.
-
-	Defconfigs: Acmesystems Aria/Arietta g25, Armadeus
-	apf28/apf51, beagleboneai, Olimx a64, rock64, sheevaplug: Fix
-	build with hostcc >= 10, Nezha: Correct U-Boot dependencies
-
-	Updated/fixed packages: alsa-lib, apparmor, binutils,
-	bluez5_utils, botan, diffutils, firmware-utils, gdb, glmark2,
-	glog, gpu-amd-bin-mx51, gst1-interpipe, imx-vpuwrap, iperf,
-	isl, janet, libdnet, libglib2, libhtp, liburcu, log4cxx,
-	luajit, luvi, meson, mksh, mongodb, mosquitto, mpd, mupdf,
-	opencv4, oracle-mysql, pipewire, postgresql, python-aiohttp,
-	python-pudb, python-ujson, qhull, samba4, seatd, sg3_utils,
-	suricata, tpm2-tss, uboot, vim, xserver_xorg-server
-
-	New packages: pipewire-media-session
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx)
-
-2021.11-rc1, released November 8th, 2021
-
-	Numerous package updates. Notable updates including numerous
-	Python modules, Kodi add-ons, nodejs, OpenJDK.
-
-	Toolchain:
-	- glibc update to 2.34
-	- support for gdb 11.x added, gdb 10.x now the default
-	- external toolchains provided by ARM updated
-	- remove support for internal toolchain on the CSKY
-          architecture, as it was broken and unmaintained
-
-	Many packages updated to enable the appropriate SELinux
-	refpolicy module when SELinux support is enabled.
-
-	Support was added in the test-pkg package testing utility for
-	using Gitlab CI to run the builds.
-
-	New libgbm virtual package to better support OpenGL
-	implementations that provide a libgbm library.
-
-	Bootloaders/firmware: grub2 extended to be able to support
-	multiple platforms in the same build.
-
-	Filesystems:
-	- new OCI filesystem type, to build container images
-	  compatible with the Open Container Initiative standard
-	- support for hybrid ISO9660 images added, which work on
-          legacy and EFI BIOS machines
-
-	New defconfigs: Allwinner nezha, stm32mp157c_odyssey
-
-	Removed defconfigs: qemu_csky
-
-	New packages: dtbocfg, firmware-utils, gstd, libdbi,
-	libdbi-drivers, libteam, lua-augeas, mstpd, php-pecl-dbus,
-	python-aioprocessing, python-bidict,
-	python-charset-normalizer, python-flask-expects-json,
-	python-git, python-pyndiff, python-rsa,
-	python-unitest-xml-reporting, python-xmljson,
-	python3-cryptography, python3-pip, qt5opcua, rwmem,
-	sloci-image, softhsm2, sun20i-d1-spl, uqmi, vuejs-router,
-	watchdogd, wireplumber
-
-	Removed packages: canfestival, python-meld3
-
-	Work toward the removal of python 2 has progressed: many
-	python modules and packages have been updated to a version
-	supporting python 3.
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14271: compilation error with rsync command for  permission
-	#14276: Unable to get login prompt
-	#14196: when using raspberrypicm4io_64_defconfig, make fails
-	        with mkfs.ext4: No such file or directory while trying
-	        to determine filesystem size
-
-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.3, 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, containerd,
-	cryptopp, dash, dc3dd, docker-cli, docker-engine, dovecot,
-	erlang, fetchmail, ffmpeg, gdb, ghostscript, go, 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, kodi, kodi-pvr-octonet,
-	kodi-visualisation-fishbmc, libcurl, libkrb5, libressl,
-	libsndfile, libxcrypt, libyang, lxc, lynx, mesa3d,
-	micropython, minicom, mono, mtr, mv-ddr-marvell, net-tools,
-	nmap, nodejs, ntfs-3g, openjdk, openjdk-bin, openldap,
-	openssh, pcre2, php, python-aioconsole, python-cffi,
-	python-dateutil, python-django, python-pip, python-texttable,
-	python-urllib, python-webob, qt5location, redis, refpolicy,
-	ripgrep, runc, sispmctl, squid, strongswan, supervisor,
-	syslinux, tinycbor, trace-cmd, uboot-tools, uclibc, wavemon,
-	wget, wireless-regdb, xen, xserver_xorg-server
-
-	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.05.2, released September 15th, 2021
-
-	Important / security related fixes.
-
-	Toolchain: Disable fortify support for Microblaze as it is not
-	currently working.
-
-	Updated/fixed packages: alsa-utils, arm-trusted-firmware,
-	bayer2rgb-neon, belle-sip, bullet, busybox, c-ares, cjson,
-	coreutils, cpio, eigen, environment-setup, fetchmail, ffmpeg,
-	fontconfig, gd, gdb, gnuradio, gnutls, go, haproxy, ipmiutil,
-	iputils, jszip, kvm-unit-tests, libarchive, libargtable2,
-	libexif, libgcrypt, libmodsecurity, libopenssl, librsvg,
-	libshout, libssh, libxcrypt, linux, linux-pam, localedef, mc,
-	mesa3d, mosquitto, netsniff-ng, nginx, nodejs, ogre, openjdk,
-	openmpi, openvmtools, perl-net-ssh2, php, pipewire,
-	postgresql, prelink-cross, prosody, protobuf, python-keyring,
-	python-matplotlib, python-pillow, python-pyudev,
-	python-secretstorage, python3, qt5base, samba4, sdl2, sox,
-	swupdate, sylpheed, tar, terminology, tor, uboot-tools, uhd,
-	unbound, ushare, vim, wlroots, xapp_xrdb, xapp_xwd, xen,
-	xenomai, xlib_libXfont2, xlib_libXft, zip
-
 2021.05.1, released August 10, 2021

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

-2021.02.7, released November 10th, 2021
-
-	Important / security related fixes.
-
-	OpenJDK 16.x moved to 17.x as 16.x is EOL.
-
-	Updated/fixed packages: asterisk, audit, bind, bitcoin,
-	cryptsetup, dahdi-linux, dbus-python, dfu-util, docker-cli,
-	docker-containerd, docker-engine, earlyoom, exiv2, ffmpeg,
-	freerdp, gdb, gensio, gnupg2, go, gpsd, gst1-plugins-bad,
-	gst1-plugins-ugly, gst1-vaapi, hiredis, lftp, lightning,
-	lrzip, netdata, nodejs, olsr, openjdk, openjdk-bin, pango,
-	qemu, samba4, snort, strongswan, suricata, systemd, vim,
-	wf111, wireguard-linux-compat, xerces
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx)
-
-2021.02.6, 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, cryptopp, dash,
-	dc3dd, docker-cli, docker-containerd, docker-engine, dovecot,
-	erlang, fetchmail, gdb, ghostscript, go, 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, kodi-pvr-octonet, libcurl,
-	libkrb5, libressl, libsndfile, libyang, lxc, lynx, mesa3d,
-	micropython, minicom, mono, mtr, mv-ddr-marvell, net-tools,
-	nmap, nodejs, ntfs-3g, openjdk, openjdk-bin, openldap,
-	openssh, php, python-aioconsole, python-cffi, python-dateutil,
-	python-django, python-pip, python-texttable, python-urllib3,
-	python-webob, qt5location, redis, refpolicy, ripgrep, runc,
-	sispmctl, squid, strongswan, supervisor, syslinux, tinycbor,
-	trace-cmd, uboot-tools, uclibc, wavemon, wireless-regdb, xen,
-	xserver_xorg-server
-
-	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.02.5, released September 15th, 2021
-
-	Important / security related fixes.
-
-	Toolchain: Disable fortify support for Microblaze as it is not
-	currently working.
-
-	Updated/fixed packages: alsa-utils, arm-trusted-firmware,
-	bayer2rgb-neon, belle-sip, busybox, c-ares, cjson, coreutils,
-	cpio, eigen, environt-setup, fetchmail, fluidsynth,
-	fontconfig, gd, gdb, gnuradio, gnutls, go, haproxy, ipmiutil,
-	iputils, jszip, kvm-unit-tests, libarchive, libexif,
-	libgcrypt, libmodsecurity, libopenssl, librsvg, libshout,
-	libssh, linux, localedef, mc, mesa3d, mosquitto, netsniff-ng,
-	nginx, nodejs, ogre, openmpi, openvmtools, php, postgresql,
-	prelink-cross, prosody, protobuf, python-keyring,
-	python-matplotlib, python-pillow, python-pyudev,
-	python-secretstorage, python3, qt5base, samba4, sdl2, sox,
-	swupdate, sylpheed, tor, uboot-tools, uhd, unbound, vim,
-	wlroots, xapp_xrdb, xapp_xwd, xen, xenomai, xlib_libXfont2,
-	xlib_libXft, zip
-
-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,224 +144,6 @@ endif

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

-comment "Legacy options removed in 2021.11"
-
-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_MPD_TIDAL
-	bool "mpd tidal option removed"
-	select BR2_LEGACY
-	help
-	  tidal has been removed from mpd since version 0.22.10.
-
-config BR2_PACKAGE_MROUTED_RSRR
-	bool "RSRR for RSVP removed in mrouted v4.4"
-	select BR2_LEGACY
-	help
-	  The RSRR configure option and feature was dropped in upstream
-	  mrouted as of v4.4.  This feature was marked as experimental
-	  since its inception well before v4.0 and was never deployed
-	  in the field outside of academia.
-
-config BR2_BINUTILS_VERSION_CSKY
-	bool "binutils csky version removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils csky version has been removed.
-
-config BR2_GCC_VERSION_CSKY
-	bool "gcc csky version removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc csky version has been removed.
-
-config BR2_PACKAGE_CANFESTIVAL
-	bool "canfestival package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it is unmaintained since
-	  November 2017.
-
-config BR2_PACKAGE_NMAP_NDIFF
-	bool "The ndiff utility has been removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_PYTHON_PYNDIFF
-	help
-	  The ndiff utility provided by nmap requires python2 which is
-	  deprecated. The same functionality is provided by the python
-	  package pyndiff.
-
-config BR2_GDB_VERSION_8_3
-	bool "gdb version 8.3.x removed"
-	select BR2_LEGACY
-	help
-	  gdb 8.3.x has been removed, use a newer version instead.
-
-config BR2_PACKAGE_PYTHON_MELD3
-	bool "python-meld3 package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it is unmaintained since
-	  April 2020.
-
-config BR2_PACKAGE_STRONGSWAN_EAP
-	bool "strongswan EAP plugins now individually selectable"
-	select BR2_LEGACY
-	help
-	  The various EAP plugins are now individually selectable.
-
-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_KERNEL_HEADERS_5_11
-	bool "kernel headers version 5.11.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.11.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_5_12
-	bool "kernel headers version 5.12.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_5_13
-	bool "kernel headers version 5.13.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.13.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-comment "Legacy options removed in 2021.08"
-
-config BR2_TARGET_GRUB2_BUILTIN_MODULES
-	string "the grub2 builtin modules has been renamed"
-	help
-	  This option has been split to separate the builtin modules
-	  between BR2_TARGET_GRUB2_BUILTIN_MODULES_PC and
-	  BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI.
-
-config BR2_TARGET_GRUB2_BUILTIN_MODULES_WRAP
-	bool
-	default y if BR2_TARGET_GRUB2_BUILTIN_MODULES != ""
-	select BR2_LEGACY
-
-config BR2_TARGET_GRUB2_BUILTIN_CONFIG
-	string "the grub2 builtin configuration has been renamed"
-	help
-	  This option has been split to separate the builtin
-	  configuration between BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC and
-	  BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI.
-
-config BR2_TARGET_GRUB2_BUILTIN_CONFIG_WRAP
-	bool
-	default y if BR2_TARGET_GRUB2_BUILTIN_CONFIG != ""
-	select BR2_LEGACY
-
-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
@@ -556,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/
@@ -601,9 +600,6 @@ F:	package/odroidc2-firmware/
 N:	Daniel J. Leach <dleach@belcan.com>
 F:	package/dacapo/

-N:	Daniel Lang <d.lang@abatec.at>
-F:	package/paho-mqtt-cpp/
-
 N:	Damien Lanson <damien@kal-host.com>
 F:	package/libvdpau/
 F:	package/log4cpp/
@@ -651,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/
@@ -675,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/
@@ -694,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/
@@ -844,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/
@@ -901,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/
@@ -910,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/
@@ -965,7 +948,6 @@ F:	package/lsqlite3/
 F:	package/lua*
 F:	package/lzlib/
 F:	package/moarvm/
-F:	package/mstpd/
 F:	package/netsurf/
 F:	package/perl*
 F:	package/pkg-perl.mk
@@ -1050,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/
@@ -1110,7 +1081,9 @@ F:	package/reaver/
 N:	Guo Ren <ren_guo@c-sky.com>
 F:	arch/Config.in.csky
 F:	board/csky/
+F:	board/qemu/csky
 F:	configs/csky_*
+F:	configs/qemu_csky*

 N:	Gustavo Heinz <gustavo@gsthnz.com>
 F:	package/python-m2crypto/
@@ -1120,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/
@@ -1135,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/
@@ -1148,18 +1117,6 @@ F:	package/sysrepo/
 N:	Henrique Camargo <henrique@henriquecamargo.com>
 F:	package/json-glib/

-N:	Hervé Codina <herve.codina@bootlin.com>
-F:	package/dtbocfg/
-F:	package/libdbi/
-F:	package/libdbi-drivers/
-F:	package/lua-augeas/
-F:	support/testing/tests/package/test_dtbocfg.py
-F:	support/testing/tests/package/test_lua_augeas.py
-
-N:	Hervé Codina <herve.codina@bootlin.com>
-F:	package/php-pecl-dbus/
-F:	support/testing/tests/package/test_php_pecl_dbus.py
-
 N:	Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>
 F:	package/gauche/
 F:	package/gmrender-resurrect/
@@ -1245,18 +1202,15 @@ F:	package/python-aiohttp-sse/
 F:	package/python-aiologstash/
 F:	package/python-aiomonitor/
 F:	package/python-aiojobs/
-F:	package/python-aioprocessing/
 F:	package/python-aiorwlock/
 F:	package/python-aiosignal/
 F:	package/python-aiozipkin/
 F:	package/python-argon2-cffi/
 F:	package/python-async-lru/
 F:	package/python-async-timeout/
-F:	package/python-bidict/
 F:	package/python-brotli/
 F:	package/python-cbor2/
 F:	package/python-cchardet/
-F:	package/python-charset-normalizer/
 F:	package/python-flatbuffers/
 F:	package/python-frozenlist/
 F:	package/python-greenlet/
@@ -1297,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/

@@ -1343,16 +1294,10 @@ F:	package/rtty/
 N:	Joachim Wiberg <troglobit@gmail.com>
 F:	configs/globalscale_espressobin_defconfig
 F:	board/globalscale/espressobin/
-F:	package/libite/
-F:	package/libteam/
-F:	package/libuev/
 F:	package/mg/
-F:	package/mrouted/
 F:	package/netcalc/
-F:	package/smcroute/
 F:	package/ssdp-responder/
 F:	package/sysklogd/
-F:	package/watchdogd/

 N:	Joao Pinto <jpinto@synopsys.com>
 F:	board/synopsys/vdk/
@@ -1454,9 +1399,6 @@ N:	José Luis Salvador Rufo <salvador.joseluis@gmail.com>
 F:	package/zfs/
 F:	support/testing/tests/package/test_zfs.py

-N:	José Pekkarinen <jose.pekkarinen@unikie.com>
-F:	package/softhsm2/
-
 N:	Joseph Kogut <joseph.kogut@gmail.com>
 F:	package/at-spi2-atk/
 F:	package/at-spi2-core/
@@ -1473,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/

@@ -1540,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/
@@ -1589,8 +1530,6 @@ F:	package/python-daemonize/
 F:	package/python-flask/
 F:	package/python-flask-babel/
 F:	package/python-gunicorn/
-F:	support/testing/tests/package/sample_python_flask.py
-F:	support/testing/tests/package/test_python_flask.py

 N:	Lionel Orry <lionel.orry@gmail.com>
 F:	package/mongrel2/
@@ -1695,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/
@@ -1706,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

@@ -1823,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/
@@ -1861,7 +1796,6 @@ F:	package/raptor/
 F:	package/rng-tools/
 F:	package/rsyslog/
 F:	package/setools/
-F:	package/sloci-image/
 F:	package/smcroute/
 F:	package/tclap/
 F:	package/tini/
@@ -1871,8 +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/fs/test_oci.py
 F:	support/testing/tests/package/br2-external/openjdk/
 F:	support/testing/tests/package/test_openjdk.py
 F:	support/testing/tests/package/test_opkg/
@@ -1903,13 +1835,40 @@ N:	Max Filippov <jcmvbkbc@gmail.com>
 F:	arch/Config.in.xtensa

 N:	Maxim Kochetkov <fido_max@inbox.ru>
-F:	package/libgeos/
-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
@@ -1973,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/
@@ -1988,7 +1951,6 @@ N:	Naumann Andreas <ANaumann@ultratronik.de>
 F:	package/evemu/
 F:	package/libevdev/
 F:	package/pkg-qmake.mk
-F:	package/qt5/qt5opcua/

 N:	Nicola Di Lieto <nicola.dilieto@gmail.com>
 F:	package/uacme/
@@ -1998,28 +1960,7 @@ F:	board/intel/galileo/
 F:	configs/galileo_defconfig

 N:	Nicolas Carrier <nicolas.carrier@orolia.com>
-F:	package/bmap-tools/
-F:	package/libdbi/
-F:	package/libdbi-drivers/
-F:	package/lua-augeas/
-F:	package/php-pecl-dbus/
 F:	package/php-xdebug/
-F:	package/python-augeas/
-F:	package/python-flask-expects-json/
-F:	package/python-git/
-F:	package/python-unittest-xml-reporting/
-F:	support/testing/tests/package/test_lua_augeas.py
-F:	support/testing/tests/package/sample_bmap_tools.sh
-F:	support/testing/tests/package/sample_python_augeas.py
-F:	support/testing/tests/package/sample_python_flask_expects_json.py
-F:	support/testing/tests/package/sample_python_git.py
-F:	support/testing/tests/package/sample_python_unittest_xml_reporting.py
-F:	support/testing/tests/package/test_bmap_tools.py
-F:	support/testing/tests/package/test_php_pecl_dbus.py
-F:	support/testing/tests/package/test_python_augeas.py
-F:	support/testing/tests/package/test_python_flask_expects_json.py
-F:	support/testing/tests/package/test_python_git.py
-F:	support/testing/tests/package/test_python_unittest_xml_reporting.py

 N:	Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
 F:	package/libgit2/
@@ -2106,7 +2047,6 @@ N:	Peter Korsgaard <peter@korsgaard.com>
 F:	board/arrow/avenger96/
 F:	board/beagleboneai/
 F:	board/minnowboard/
-F:	board/nezha/
 F:	board/librecomputer/lafrite/
 F:	board/nexbox/a95x/
 F:	board/openblocks/a6/
@@ -2114,14 +2054,12 @@ F:	board/orangepi/
 F:	board/pandaboard/
 F:	board/roseapplepi/
 F:	boot/shim/
-F:	boot/sun20i-d1-spl/
 F:	configs/avenger96_defconfig
 F:	configs/beagleboneai_defconfig
 F:	configs/lafrite_defconfig
 F:	configs/minnowboard_max-graphical_defconfig
 F:	configs/minnowboard_max_defconfig
 F:	configs/nexbox_a95x_defconfig
-F:	configs/nezha_defconfig
 F:	configs/openblocks_a6_defconfig
 F:	configs/orangepi_pc_defconfig
 F:	configs/orangepi_r1_defconfig
@@ -2193,9 +2131,7 @@ F:	package/qt5/
 F:	package/quotatool/
 F:	package/racehound/
 F:	package/redir/
-F:	package/rtl8812au-aircrack-ng/
 F:	package/uredir/
-F:	package/uqmi/
 F:	package/wayland-utils/

 N:	Peter Thompson <peter.macleod.thompson@gmail.com>
@@ -2280,9 +2216,6 @@ N:	Rafal Susz <rafal.susz@gmail.com>
 F:	board/avnet/s6lx9_microboard/
 F:	configs/s6lx9_microboard_defconfig

-N:	Rafał Miłecki <rafal@milecki.pl>
-F:	package/firmware-utils/
-
 N:	Rahul Bedarkar <rahulbedarkar89@gmail.com>
 F:	package/cxxtest/
 F:	package/gflags/
@@ -2297,17 +2230,11 @@ 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-rsa/
 F:	package/python-s3transfer/
-F:	support/testing/tests/package/sample_python_rsa.py
-F:	support/testing/tests/package/test_python_rsa.py

 N:	Refik Tuzakli <tuzakli.refik@gmail.com>
 F:	package/freescale-imx/
@@ -2370,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/
@@ -2424,6 +2350,8 @@ 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/
@@ -2480,7 +2408,6 @@ F:	package/curlpp/
 F:	package/daq/
 F:	package/libgdiplus/
 F:	package/pimd/
-F:	package/sloci-image/
 F:	package/snort/
 F:	package/stella/
 F:	package/tio/
@@ -2527,10 +2454,6 @@ F:	package/xscreensaver/
 F:	package/zmqpp/
 F:	package/zyre/

-N:	Simon Doppler <dopsi@dopsi.ch>
-F:	board/seeed/
-F:	configs/stm32mp157c_odyssey_defconfig
-
 N:	Spenser Gilliland <spenser@gillilanding.com>
 F:	arch/Config.in.microblaze
 F:	package/a10disp/
@@ -2599,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/
@@ -2621,7 +2547,6 @@ F:	package/x265/
 N:	Thomas Claveirole <thomas.claveirole@green-communications.fr>
 F:	package/fcgiwrap/
 F:	package/openlayers/
-F:	package/vuejs-router/

 N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
@@ -2683,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/
@@ -2721,12 +2645,8 @@ F:	package/pkg-autotools.mk
 F:	package/pkg-generic.mk
 F:	package/python/
 F:	package/python3/
-F:	package/python-augeas/
-F:	package/python-flask-expects-json/
-F:	package/python-git/
 F:	package/python-mad/
 F:	package/python-serial/
-F:	package/python-unittest-xml-reporting/
 F:	package/qextserialport/
 F:	package/riscv64-elf-toolchain/
 F:	package/rpcbind/
@@ -2738,16 +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/sample_python_flask.py
-F:	support/testing/tests/package/sample_python_flask_expects_json.py
-F:	support/testing/tests/package/sample_python_git.py
-F:	support/testing/tests/package/sample_python_unittest_xml_reporting.py
-F:	support/testing/tests/package/test_python_augeas.py
-F:	support/testing/tests/package/test_python_flask.py
-F:	support/testing/tests/package/test_python_flask_expects_json.py
-F:	support/testing/tests/package/test_python_git.py
-F:	support/testing/tests/package/test_python_unittest_xml_reporting.py
 F:	toolchain/

 N:	Timo Ketola <timo.ketola@exertus.fi>
@@ -2794,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.11-rc3
+export BR2_VERSION := 2021.05.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1638292000
+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
@@ -77,8 +77,9 @@ config BR2_aarch64_be

 config BR2_csky
 	bool "csky"
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_ARCH_HAS_MMU_MANDATORY
+	# Most variants are supported by gcc-9+, except one that is
+	# handled as a special exception in package/gcc/Config.in.host
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
@@ -209,6 +210,7 @@ config BR2_powerpc64le

 config BR2_riscv
 	bool "RISCV"
+	select BR2_ARCH_HAS_MMU_MANDATORY
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	help
 	  RISC-V is an open, free Instruction Set Architecture created
@@ -319,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
@@ -71,12 +71,10 @@ choice

 config BR2_RISCV_32
 	bool "32-bit"
-	select BR2_ARCH_HAS_MMU_MANDATORY

 config BR2_RISCV_64
 	bool "64-bit"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_OPTIONAL

 endchoice

@@ -1,30 +1,32 @@
 image efi-part.vfat {
-	vfat {
-		file EFI {
-			image = "efi-part/EFI"
-		}
-		file Image {
-			image = "Image"
-		}
-	}
-
-	size = 32M
+  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
-	}
+  hdimage {
+    gpt = true
+  }

-	partition boot {
-		image = "efi-part.vfat"
-		partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
-		offset = 32K
-		bootable = true
-	}
+  partition boot {
+    image = "efi-part.vfat"
+    partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
+    offset = 32768
+    bootable = true
+  }

-	partition root {
-		partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
-		image = "rootfs.ext2"
-	}
+  partition root {
+    partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
+    image = "rootfs.ext2"
+  }
 }
@@ -8,7 +8,6 @@ image boot.vfat {
 			"at91-sama5d3_acqua.dtb"
 		}
 	}
-
 	size = 16M
 }

@@ -11,10 +11,9 @@ 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
 }

@@ -5,16 +5,15 @@ image boot.vfat {
 		file zImage {
 			image = "zImage"
 		}
-
+		
 		file acme-arietta.dtb {
 			image = "at91-ariettag25.dtb"
 		}
-
+		
 		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
 }

@@ -5,7 +5,6 @@ image boot.vfat {
 			"socfpga_cyclone5_socrates.dtb"
 		}
 	}
-
 	size = 8M
 }

@@ -18,7 +17,7 @@ image uboot.img {
 		in-partition-table = "no"
 		image = "u-boot-spl.bin.crc"
 		offset = 0
-		size = 64K
+		size = 64k
 	}

 	partition uboot-full {
@@ -37,7 +36,7 @@ image sdcard.img {
 	partition uboot-env {
 		in-partition-table = "no"
 		image = "uboot-env.bin"
-		offset = 17K # 512 * 34 -> just after gpt
+		offset = 17408 # 512 * 34 -> just after gpt
 	}

 	partition boot {
@@ -6,6 +6,5 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }
@@ -0,0 +1,35 @@
+From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001
+From: Shyam Saini <shyam.saini@amarulasolutions.com>
+Date: Mon, 15 Apr 2019 16:16:16 +0530
+Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB
+
+The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which
+causes board reset because of larger uImage size.
+
+Error log snippet:
+   Booting using the fdt blob at 0x1f00000
+   Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN
+Must RESET board to recover
+resetting ...
+
+Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
+---
+ include/configs/rk3288_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
+index 72a54bc0ab..eab7cf4d86 100644
+--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
+@@ -9,6 +9,8 @@
+ #include <asm/arch/hardware.h>
+ #include "rockchip-common.h"
+ 
+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
+
+ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+ #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
+ #define CONFIG_SYS_CBSIZE		1024
+-- 
+2.11.0
+
@@ -0,0 +1,35 @@
+From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001
+From: Shyam Saini <shyam.saini@amarulasolutions.com>
+Date: Mon, 15 Apr 2019 16:16:16 +0530
+Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB
+
+The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which
+causes board reset because of larger uImage size.
+
+Error log snippet:
+   Booting using the fdt blob at 0x1f00000
+   Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN
+Must RESET board to recover
+resetting ...
+
+Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
+---
+ include/configs/rk3288_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
+index 72a54bc0ab..eab7cf4d86 100644
+--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
+@@ -9,6 +9,8 @@
+ #include <asm/arch/hardware.h>
+ #include "rockchip-common.h"
+ 
+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
+
+ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+ #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
+ #define CONFIG_SYS_CBSIZE		1024
+-- 
+2.11.0
+
@@ -17,7 +17,6 @@ image boot.vfat {
 			image = "uboot-env.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.
@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}

 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}

 	partition boot {
@@ -5,7 +5,6 @@ image boot.vfat {
 			"u-boot.img"
 		}
 	}
-
 	size = 4M
 }

@@ -16,7 +15,7 @@ image sdcard.img {
 	partition u-boot {
 		partition-type = 0xC
 		bootable = "true"
-		image = "boot.vfat"
+                image = "boot.vfat"
 	}

 	partition rootfs {
@@ -12,7 +12,6 @@ image boot.vfat {
 			"am335x-bonegreen.dtb",
 		}
 	}
-
 	size = 16M
 }

@@ -23,7 +22,7 @@ image sdcard.img {
 	partition u-boot {
 		partition-type = 0xC
 		bootable = "true"
-		image = "boot.vfat"
+                image = "boot.vfat"
 	}

 	partition rootfs {
@@ -8,7 +8,6 @@ image boot.vfat {
 			"uEnv.txt"
 		}
 	}
-
 	size = 16M
 }

@@ -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
@@ -1,12 +1,12 @@
 image sdcard.img {
-	hdimage {
-		gpt = true
-	}
+  hdimage {
+    gpt = true
+  }

-	partition rootfs {
-		partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224
-		partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958
-		bootable = "true"
-		image = "rootfs.ext4"
-	}
+  partition rootfs {
+    partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224
+    partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958
+    bootable = "true"
+    image = "rootfs.ext4"
+  }
 }
@@ -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
@@ -6,7 +6,6 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -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,28 +1,28 @@
 image sdcard.img {
-	hdimage {
-	}
+    hdimage {
+    }

-	partition uboot-spl {
-		in-partition-table = "no"
-		image = "u-boot-spl.bin"
-		offset = 512
-	}
+    partition uboot-spl {
+        in-partition-table = "no"
+        image = "u-boot-spl.bin"
+        offset = 512
+    }

-	partition uboot {
-		in-partition-table = "no"
-		image = "u-boot.img"
-		offset = 14K
-	}
+    partition uboot {
+        in-partition-table = "no"
+        image = "u-boot.img"
+        offset = 14k
+    }

-	partition uboot-env {
-		in-partition-table = "no"
-		image = "uboot-env.bin"
-		offset = 526K
-	}
+    partition uboot-env {
+        in-partition-table = "no"
+        image = "uboot-env.bin"
+        offset = 526k
+    }

-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		offset = 2M
-	}
+    partition rootfs {
+        partition-type = 0x83
+        image = "rootfs.ext4"
+        offset = 2M
+    }
 }
@@ -9,7 +9,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -20,8 +19,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -1,17 +1,17 @@
 image sdcard.img {
-	hdimage {
-	}
+    hdimage {
+    }

-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.imx"
-		offset = 1K
-	}
+    partition u-boot {
+        in-partition-table = "no"
+        image = "u-boot.imx"
+        offset = 1024
+    }

-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-		offset = 1M
-		size = 60M
-	}
+    partition rootfs {
+        partition-type = 0x83
+        image = "rootfs.ext2"
+        offset = 1M
+        size = 60M
+    }
 }
@@ -5,7 +5,6 @@ image boot.vfat {
 			"imx6ul-geam-kit.dtb"
 		}
 	}
-
 	size = 64M
 }

@@ -16,7 +15,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}

 	partition u-boot-dtb {
@@ -8,7 +8,6 @@ image boot.vfat {
 			"imx6q-icore-ofcap12.dtb"
 		}
 	}
-
 	size = 64M
 }

@@ -19,7 +18,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}

 	partition u-boot-dtb {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"imx6q-icore-rqs.dtb"
 		}
 	}
-
 	size = 64M
 }

@@ -17,7 +16,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}

 	partition u-boot-dtb {
@@ -5,7 +5,6 @@ image boot.vfat {
 			"imx6ul-isiot-emmc.dtb"
 		}
 	}
-
 	size = 64M
 }

@@ -16,7 +15,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}

 	partition u-boot-dtb {
@@ -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
  }
 }
@@ -25,8 +25,6 @@ linux_image()
 		echo "\"uImage\""
 	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then
 		echo "\"Image\""
-	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then
-		echo "\"Image.gz\""
 	else
 		echo "\"zImage\""
 	fi
@@ -49,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,39 +1,39 @@
 image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"rk3399-nanopc-t4.dtb",
-			"extlinux"
-		}
-	}
-
-	size = 64M
+        vfat {
+                files = {
+                        "Image",
+                        "rk3399-nanopc-t4.dtb",
+                        "extlinux"
+                }
+        }
+        size = 64M
 }

 image sdcard.img {
-	hdimage {
-		gpt = true
-	}

-	partition loader1 {
-		image = "idbloader.img"
-		offset = 32K
-	}
+        hdimage {
+                gpt = true
+        }

-	partition loader2 {
-		image = "u-boot.itb"
-		offset = 8M
-	}
+        partition loader1 {
+                image = "idbloader.img"
+                offset = 32K
+        }

-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 16M
-	}
+        partition loader2 {
+                image = "u-boot.itb"
+                offset = 8M
+        }

-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
+        partition boot {
+                partition-type = 0xC
+                bootable = "true"
+                image = "boot.vfat"
+                offset = 16M
+        }
+
+        partition rootfs {
+                partition-type = 0x83
+                image = "rootfs.ext4"
+        }
 }
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}

 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}

 	partition boot {
@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,11 +6,11 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

 image sdcard.img {
+
 	hdimage {
 		gpt = true
 	}
@@ -6,7 +6,6 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}

 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,7 +16,7 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}

 	partition u-boot {
@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -2,31 +2,30 @@
 #

 image boot.vfat {
-	vfat {
-		files = {
-			"MLO",
-			"u-boot.img",
-			"am335x-chiliboard.dtb",
-			"zImage"
-		}
-	}
-
-	size = 16M
+  vfat {
+    files = {
+      "MLO",
+      "u-boot.img",
+      "am335x-chiliboard.dtb",
+      "zImage"
+    }
+  }
+  size = 16M
 }

 image sdcard.img {
-	hdimage {
-	}
+  hdimage {
+  }

-	partition u-boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 1M
-	}
+  partition u-boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+    offset = 1M
+  }

-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
 }
@@ -9,41 +9,40 @@
 #

 image boot.vfat {
-	vfat {
-		files = {
-			"imx6ul-liteboard.dtb",
-			"zImage"
-		}
-	}
-
-	size = 16M
+  vfat {
+    files = {
+      "imx6ul-liteboard.dtb",
+      "zImage"
+    }
+  }
+  size = 16M
 }

 image sdcard.img {
-	hdimage {
-	}
+  hdimage {
+  }

-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1K
-	}
+  partition SPL {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1K
+  }

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

-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+    offset = 8M
+  }

-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
 }
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -23,7 +22,7 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "uboot-odc2.img"
-		offset = 49664 # 48KB + 512B
+		offset = 49664
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"exynos5422-odroidxu4.dtb"
 		}
 	}
-
 	size = 32M
 }

@@ -18,34 +17,34 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "bl1.bin.hardkernel"
 		offset = 512
-		size = 15K
+		size = 15360
 	}

 	partition bl2 {
 		in-partition-table = "no"
 		image = "bl2.bin.hardkernel.720k_uboot"
-		offset = 15872 # 15KB + 512B
-		size = 16K
+		offset = 15872
+		size = 16384
 	}

 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-dtb.bin"
-		offset = 32256 # 31KB + 512B
-		size = 720K
+		offset = 32256
+		size = 720k
 	}

 	partition tzsw {
 		in-partition-table = "no"
 		image = "tzsw.bin.hardkernel"
-		offset = 769536 # 751KB + 512B
-		size = 256K
+		offset = 769536
+		size = 256k
 	}

 	partition vfat {
 		partition-type = 0xC
 		image = "boot.vfat"
-		offset = 2M
+		offset = 2097152
 	}

 	partition rootfs {
@@ -1,12 +1,14 @@
 # Create an image of the efi partition
 image efi-part.vfat {
 	vfat {
+		file startup.nsh {
+			image = "efi-part/startup.nsh"
+		}
 		file EFI {
 			image = "efi-part/EFI"
 		}
 	}
-
-	size = 512K
+	size=512K
 }

 # Create the sdcard image, pulling in
@@ -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
@@ -5,8 +5,8 @@
 # The Flash image

 flash nor-16M-256 {
-	pebsize = 4K
-	numpebs = 4K
+	pebsize = 4096
+	numpebs = 4096
 	minimum-io-unit-size = 256
 }

@@ -14,28 +14,24 @@ image flash.bin {
 	flash {
 	}
 	flashtype = "nor-16M-256"
-
 	partition uboot {
 		image = "u-boot.bin"
 		size = 256K
 	}
-
 	partition dtb {
 		image = "da850-lego-ev3.dtb"
-		offset = 256K
 		size = 64K
+		offset = 0x40000
 	}
-
 	partition uimage {
 		image = "uImage"
-		offset = 320K
 		size = 4M
+		offset = 0x50000
 	}
-
 	partition rootfs {
 		image = "rootfs.squashfs"
-		offset = 4416K # 4M + 320KB
 		size = 10M
+		offset = 0x450000
 	}
 }

@@ -46,26 +42,22 @@ image boot.vfat {
 		file uImage {
 			image = "uImage"
 		}
-
 		file da850-lego-ev3.dtb {
 			image = "da850-lego-ev3.dtb"
 		}
 	}
-
 	size = 16M
 }

 image sdcard.img {
 	hdimage {
 	}
-
 	partition boot {
 		partition-type = 0xC
 		bootable = "true"
 		image = "boot.vfat"
 		offset = 4M
 	}
-
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext2"
@@ -9,7 +9,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -20,8 +19,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -7,7 +7,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 8M
 }

@@ -18,8 +17,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 504K # 512KB - 8KB
+		offset = 8192
+		size = 516096 # 512KB - 8192
 	}

 	partition boot {
@@ -10,7 +10,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 16M
 }

@@ -25,8 +24,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }

@@ -1,32 +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,6 +1,9 @@
 # Create an image of the efi partition
 image efi-part.vfat {
 	vfat {
+		file startup.nsh {
+			image = "efi-part/startup.nsh"
+		}
 		file EFI {
 			image = "efi-part/EFI"
 		}
@@ -8,7 +11,6 @@ image efi-part.vfat {
 			image = "bzImage"
 		}
 	}
-
 	size=10M
 }

@@ -7,7 +7,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 32M
 }

@@ -1,37 +0,0 @@
-# Minimal SD card image for the Allwinner Nezha
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot0-1 {
-		in-partition-table = "no"
-		image = "boot0_sdcard_sun20iw1p1.bin"
-		offset = 8K
-	}
-
-	partition boot0-2 {
-		in-partition-table = "no"
-		image = "boot0_sdcard_sun20iw1p1.bin"
-		offset = 128K
-	}
-
-	partition u-boot-1 {
-		in-partition-table = "no"
-		image = "u-boot.toc1"
-		offset = 12288K
-	}
-
-	partition u-boot-2 {
-		in-partition-table = "no"
-		image = "u-boot.toc1"
-		offset = 16400K
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		bootable = "true"
-		offset = 18M
-	}
-}
@@ -1,4 +0,0 @@
-label linux
-  kernel /boot/Image
-  devicetree /boot/sun20i-d1-nezha.dtb
-  append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait
@@ -1,36 +0,0 @@
-From 99cf8f37ceb1def9e7bbaccc395cf2275723e03d Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Thu, 4 Nov 2021 22:15:13 +0100
-Subject: [PATCH] arch/riscv/dts/sun20i-d1.dtsi: adjust plic compatible to
- match opensbi
-
-The T-HEAD PLIC is by default not accessible from S-mode, and access must be
-enabled by opensbi to make it accessible to Linux.
-
-The DTB is used both by U-Boot and opensbi (but the PLIC node is ignored by
-U-Boot), so change the compatible to match what opensbi expects to fix a
-crash during Linux boot:
-
-https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- arch/riscv/dts/sun20i-d1.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/riscv/dts/sun20i-d1.dtsi b/arch/riscv/dts/sun20i-d1.dtsi
-index 280e0336d4..56d02c33b0 100644
--- a/arch/riscv/dts/sun20i-d1.dtsi
-+++ b/arch/riscv/dts/sun20i-d1.dtsi
-@@ -1136,7 +1136,7 @@
- 
- 		plic: interrupt-controller@10000000 {
- 			compatible = "allwinner,sun20i-d1-plic",
-				     "sifive,plic-1.0.0";
-+				     "thead,c900-plic";
- 			reg = <0x10000000 0x4000000>;
- 			#address-cells = <0>;
- 			interrupts-extended = <&cpu0_intc 11>,
-- 
-2.20.1
-
@@ -1,54 +0,0 @@
-From 4a923e0e4ef6d2b41cb89d658e269adada847573 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Thu, 4 Nov 2021 22:32:04 +0100
-Subject: [PATCH] Makefile: HACK: Support building u-boot.toc1 for nezda board
-
-For easier integration into Buildroot.  The boot0 / toc1 logic is WIP until
-U-Boot gains SPL support for the D1, so add a hack to make it easier to
-integrate in Buildroot as-is.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- Makefile  | 9 +++++++++
- nezha.cfg | 9 +++++++++
- 2 files changed, 18 insertions(+)
- create mode 100644 nezha.cfg
-
-diff --git a/Makefile b/Makefile
-index f911f70344..259d93bf80 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1084,6 +1084,15 @@ endif
- .binman_stamp: FORCE
- 	@touch $@
- 
-+fw_dynamic.bin: $(OPENSBI)
-+	$(call if_changed,copy)
-+
-+MKIMAGEFLAGS_u-boot.toc1 = -T sunxi_toc1
-+u-boot.toc1: nezha.cfg fw_dynamic.bin inputs
-+	$(call if_changed,mkimage)
-+
-+all: u-boot.toc1
-+
- ifeq ($(CONFIG_DEPRECATED),y)
- 	$(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.")
- endif
-diff --git a/nezha.cfg b/nezha.cfg
-new file mode 100644
-index 0000000000..2d23b9b388
--- /dev/null
-+++ b/nezha.cfg
-@@ -0,0 +1,9 @@
-+[opensbi]
-+file = fw_dynamic.bin
-+addr = 0x40000000
-+[dtb]
-+file = arch/riscv/dts/sun20i-d1-nezha.dtb
-+addr = 0x44000000
-+[u-boot]
-+file = u-boot-nodtb.bin
-+addr = 0x4a000000
-- 
-2.20.1
-
@@ -1,24 +0,0 @@
-Allwinner Nezha
-===============
-
-Nezha is is a low-cost RISC-V 64-bit based platform, powered by an
-Allwinner D1 SoC.
-
-How to build
-============
-
-$ make nezha_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
-
-Connect a TTL UART to the debug connector, insert the microSD card and
-plug in a USB-C cable to the PWR connector to boot the system.
@@ -1,13 +1,12 @@
 image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun5i-a13-olinuxino.dtb",
-			"boot.scr"
-		}
-	}
-
-	size = 64M
+        vfat {
+                files = {
+                        "zImage",
+                        "sun5i-a13-olinuxino.dtb",
+                        "boot.scr"
+                }
+        }
+        size = 64M
 }

 image sdcard.img {
@@ -17,15 +16,16 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-	}
+        partition boot {
+                partition-type = 0xC
+                bootable = "true"
+                image = "boot.vfat"
+        }
+

 	partition rootfs {
 		partition-type = 0x83
@@ -5,8 +5,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8KB
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition rootfs {
@@ -1,4 +0,0 @@
-label Olinuxino
-    kernel /boot/zImage
-    fdtdir /boot
-    append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra}
@@ -5,8 +5,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition rootfs {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -17,7 +16,7 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}

 	partition u-boot {
@@ -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
-
@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -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
@@ -8,23 +8,18 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

 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 = 8K
-		size = 1032K # 1MB - 8KB + 16KB(GPT)
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
@@ -33,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"
@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }

@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}

 	partition boot {
--- a/Show More
+++ b/Show More