Update for 2021.08.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/redis: security bump to v6.2.6
2021-10-11 11:46:43 +02:00 · 2021-10-11 11:43:43 +02:00 · 2021-10-10 21:36:26 +02:00 · 2021-10-10 12:04:48 +02:00 · 2021-10-10 10:18:34 +02:00 · 2021-10-09 19:20:35 +02:00
2165 changed files with 14828 additions and 18825 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,185 +1,3 @@
-2021.11.1, released January 29th, 2022
-
-	Important / security related fixes.
-
-	check-package: Improve variable override check
-
-	pkg-stats: List CVEs where the version info cannot be parsed
-	as unsure rather than completely ignoring them.
-
-	Defconfigs: Beaglebone: Support BeagleBone black wireless,
-	stm32f469_xip_disco: Fix kernel boot
-
-	Updated/fixed packages: alsa-utils, apache, binutils, cage,
-	capnproto, civetweb, clamav, collectd, connman, containerd,
-	coreutils, dav1d, docker-cli, docker-engine, erlang,
-	erlang-rebar, expat, findutils, flare-engine, flare-game,
-	font-awesome, freeswitch, gcc, ghostscript, glibc, gnuchess,
-	go, grpc, gst1-interpipe, gst1-rtsp-server, gupnp-tools,
-	hackrf, icu, imagemagick, janus-gateway, json-for-modern-cpp,
-	keepalived, lapack, libdbi, libiio, libjpeg, libmbim, libnss,
-	libopenssl, libpjsip, libqmi, liburiparser, libvirt,
-	linux-pam, lxc, mbedtls, mender, mongodb, mpd-mpc, mutt,
-	nodejs, openblas, pcre2, php, pipewire, polkit, privoxy,
-	prosody, python-charset-normalizer, python-django,
-	python-idna, python-lxml, python-pyqt5, python-requests,
-	python-urllib3, python3, qt5base, qt5location, rhash,
-	rng-tools, ruby, runc, rustc, samba4, sofia-sip, targetcli-fb,
-	tcpreplay, tinyxml, tor, tpm2-tss, util-linux-libs, vim, vlc,
-	wireshark, xapp_xauth, xapp_xinput-calibrator, xen, xenomai,
-	xlib_libX11, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14451: nodejs won't build on Fedora 35
-	#14471: alsa_utils wrong deployment
-
-2021.11, released December 5th, 2021
-
-	Various fixes.
-
-	Defconfigs: Grinn chiliboard/liteboard, PC x86-64 bios: Fix
-	build
-
-	Updated/fixed packages: apr, coreutils, diffutils, e2fsprogs,
-	exfat, freeswitch, gnupg, grub2, gstreamer1, guile, heimdal,
-	hiawatha, hplip, icu, janus-gateway,
-	kodi-screensaver-asterwave, kodi-screensaver-cpblobs,
-	kodi-screensaver-matrixtrails, libatomic_ops, libbson, libffi,
-	libgdiplus, libgee, libhtp, libite, libnspr, libnss,
-	libunwind, lynx, mender-grubenv, mkpasswd, motion, mxml,
-	netdata, qemu, samba4, speex, stress-ng, tinydtls, unixodbc,
-	unrar, util-linux, util-linux-libs, watchdogd, wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14351: needs to mount sysfs before mount -a
-	#14411: 2021.11-rc2: Samba doesn't compile
-
-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.
@@ -345,62 +163,6 @@
 	#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.
@@ -599,79 +361,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.
@@ -144,85 +144,7 @@ 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.
+comment "Legacy options removed in 2021.08"

 config BR2_PACKAGE_GNURADIO_PAGER
 	bool "gnuradio gr-flex support removed"
@@ -230,53 +152,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
 	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
@@ -133,9 +133,6 @@ F:	package/wine/
 N:	Andreas Klinger <ak@it-klinger.de>
 F:	package/ply/

-N:	Andreas Ziegler <br015@umbiko.net>
-F:	package/mpd/
-
 N:	Andrey Smirnov <andrew.smirnov@gmail.com>
 F:	package/python-backports-shutil-get-terminal-size/
 F:	package/python-decorator/
@@ -232,6 +229,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/
@@ -604,9 +605,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/
@@ -787,6 +785,9 @@ F:	package/optee-test/
 N:	Eugene Tarassov <eugene@largest.net>
 F:	package/tcf-agent/

+N:	Evan Zelkowitz <evan.zelkowitz@gmail.com>
+F:	package/sdl_gfx/
+
 N:	Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 F:	board/ci20/
 F:	configs/ci20_defconfig
@@ -965,7 +966,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,13 +1050,8 @@ 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/
@@ -1110,7 +1105,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/
@@ -1145,17 +1142,8 @@ F:	package/linuxptp/
 F:	package/netopeer2/
 F:	package/sysrepo/

-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:	Henrique Camargo <henrique@henriquecamargo.com>
+F:	package/json-glib/

 N:	Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>
 F:	package/gauche/
@@ -1242,18 +1230,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/
@@ -1340,17 +1325,11 @@ F:	package/rtty/
 N:	Joachim Wiberg <troglobit@gmail.com>
 F:	configs/globalscale_espressobin_defconfig
 F:	board/globalscale/espressobin/
-F:	package/inadyn/
 F:	package/libite/
-F:	package/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/
@@ -1452,9 +1431,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/
@@ -1587,8 +1563,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/
@@ -1859,7 +1833,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/
@@ -1870,7 +1843,6 @@ 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/
@@ -1901,7 +1873,6 @@ 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/
@@ -1971,6 +1942,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/
@@ -1986,7 +1961,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/
@@ -1997,27 +1971,12 @@ 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/
@@ -2104,7 +2063,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/
@@ -2112,14 +2070,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,7 +2149,6 @@ 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>
@@ -2278,9 +2233,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/
@@ -2302,10 +2254,7 @@ 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/
@@ -2399,6 +2348,21 @@ F:	support/testing/tests/package/test_glxinfo.py
 F:	support/testing/tests/package/test_openssh.py
 F:	toolchain/

+N:	Roman Gorbenkov <roman.gorbenkov@ens2m.org>
+F:	package/davfs2/
+
+N:	Ryan Barnett <ryan.barnett@collins.com>
+F:	package/atftp/
+F:	package/c-periphery/
+F:	package/miraclecast/
+F:	package/opkg/
+F:	package/opkg-utils/
+F:	package/python-pysnmp/
+F:	package/python-pysnmp-mibs/
+F:	package/python-tornado/
+F:	package/resiprocate/
+F:	package/websocketpp/
+
 N:	Ryan Wilkins <ryan@deadfrog.net>
 F:	package/biosdevname/

@@ -2407,6 +2371,7 @@ F:	package/lrzip/

 N:	Samuel Martin <s.martin49@gmail.com>
 F:	package/armadillo/
+F:	package/canfestival/
 F:	package/cwiid/
 F:	package/flite/
 F:	package/nginx/
@@ -2422,6 +2387,9 @@ F:	support/misc/toolchainfile.cmake.in
 N:	Sam Voss <sam.voss@gmail.com>
 F:	package/ripgrep/

+N:	Santosh Multhalli <santosh.multhalli@collins.com>
+F:	package/valijson/
+
 N:	Sébastien Szymanski <sebastien.szymanski@armadeus.com>
 F:	package/mmc-utils/
 F:	package/python-flask-jsonrpc/
@@ -2460,7 +2428,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/
@@ -2507,10 +2474,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/
@@ -2601,7 +2564,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/
@@ -2702,11 +2664,8 @@ 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/
@@ -2719,15 +2678,7 @@ 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>
@@ -2877,7 +2828,6 @@ F:	configs/beaglebone_defconfig
 F:	configs/beaglebone_qt5_defconfig
 F:	package/acl/
 F:	package/attr/
-F:	package/avrdude/
 F:	package/boost/
 F:	package/bootstrap/
 F:	package/cannelloni/
@@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2021.11.1
+export BR2_VERSION := 2021.08.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1643497000
+BR2_VERSION_EPOCH = 1633945000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -286,16 +286,12 @@ ifndef HOSTCC
 HOSTCC := gcc
 HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
 endif
-ifndef HOSTCC_NOCCACHE
 HOSTCC_NOCCACHE := $(HOSTCC)
-endif
 ifndef HOSTCXX
 HOSTCXX := g++
 HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
 endif
-ifndef HOSTCXX_NOCCACHE
 HOSTCXX_NOCCACHE := $(HOSTCXX)
-endif
 ifndef HOSTCPP
 HOSTCPP := cpp
 endif
@@ -1072,7 +1068,7 @@ printvars:
 		$(if $(QUOTED_VARS),\
 			$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
 			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
-# ')))) # Syntax colouring...
+# ' Syntax colouring...

 .PHONY: clean
 clean:
@@ -1214,7 +1210,7 @@ release:
 	$(MAKE) O=$(OUT) distclean
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
-	xz -9 -c < $(OUT).tar > $(OUT).tar.xz
+	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
 	rm -rf $(OUT) $(OUT).tar

 print-version:
@@ -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
@@ -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
 }

@@ -14,7 +14,6 @@ image boot.vfat {
 			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.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"
-		}
+		} 
 	}
-
 	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
 }

@@ -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 {
@@ -10,10 +10,8 @@ image boot.vfat {
 			"am335x-bone.dtb",
 			"am335x-boneblack.dtb",
 			"am335x-bonegreen.dtb",
-			"am335x-boneblack-wireless.dtb",
 		}
 	}
-
 	size = 16M
 }

@@ -24,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,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"
+  }
 }
@@ -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 {
@@ -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 {
@@ -11,6 +11,5 @@ image sdcard.img {
  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
@@ -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
@@ -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
 }

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

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

@@ -23,8 +22,8 @@ image sdcard.img {
 	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 = 1056768 # 1MB - 8K + 16K(GPT)
 	}

 	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,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 {
@@ -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
 }

@@ -23,8 +22,8 @@ image sdcard.img {
 	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 = 1056768 # 1MB - 8192 + 16384 (GPT)
 	}

 	partition boot {
@@ -1,4 +1,4 @@
-label RK3399_ORANGEPI linux
+label RK3399_ROCKPRO64 linux
  kernel /Image
  devicetree /rk3399-orangepi.dtb
  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait
@@ -6,11 +6,11 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

 image sdcard.img {
+
 	hdimage {
 		gpt = true
 	}
@@ -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 {
@@ -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 {
@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }

@@ -21,8 +20,8 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1032K # 1MB - 8KB + 16KB(GPT)
+		offset = 8192
+		size = 1056768 # 1MB - 8K + 16K(GPT)
 	}

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

@@ -1,22 +1,24 @@
 image disk.img {
-	hdimage {
-	}

-	partition boot {
-		in-partition-table = "no"
-		image = "boot.img"
-		offset = 0
-		size = 512
-	}
+  hdimage {
+  }

-	partition grub {
-		in-partition-table = "no"
-		image = "grub.img"
-		offset = 512
-	}
+  partition boot {
+    in-partition-table = "no"
+    image = "boot.img"
+    offset = 0
+    size = 512
+  }
+
+  partition grub {
+    in-partition-table = "no"
+    image = "grub.img"
+    offset = 512
+  }
+
+  partition root {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }

-	partition root {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
 }
@@ -1,32 +1,34 @@
 image efi-part.vfat {
-	vfat {
-		file EFI {
-			image = "efi-part/EFI"
-		}
-
-		file bzImage {
-			image = "bzImage"
-		}
-	}
-
-	size = 16352K # 16MB - 32KB
+  vfat {
+    file startup.nsh {
+      image = "efi-part/startup.nsh"
+    }
+    file EFI {
+      image = "efi-part/EFI"
+    }
+    file bzImage {
+      image = "bzImage"
+    }
+  }
+  # 16MB - 32KB
+  size = 16744448
 }

 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 = 44479540-f297-41b2-9af7-d131d5f0458a
-		partition-uuid = UUID_TMP
-		image = "rootfs.ext2"
-	}
+  partition root {
+    partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a
+    partition-uuid = UUID_TMP
+    image = "rootfs.ext2"
+  }
 }
@@ -5,11 +5,11 @@ set -e
 BOARD_DIR=$(dirname "$0")

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

    # Copy grub 1st stage to binaries, required for genimage
-    cp -f "$TARGET_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"
+    cp -f "$HOST_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR"
 fi
@@ -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 {
@@ -1,23 +1,23 @@
 image sdcard.img {
-	hdimage {
-	}
+    hdimage {
+    }

-	partition uboot-spl {
-		in-partition-table = "no"
-		image = "u-boot-tpl-spl.img"
-		offset = 32K # 512 * 0x40 from start of sd card
-	}
+    partition uboot-spl {
+        in-partition-table = "no"
+        image = "u-boot-tpl-spl.img"
+        offset = 32768 # 512 * 0x40 from start of sd card
+    }

-	partition uboot {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 256K # 512 * 0x200 from start of sd card
-	}
+    partition uboot {
+        in-partition-table = "no"
+        image = "u-boot.itb"
+        offset = 262144 # 512 * 0x200 from start of sd card
+    }

-	partition rootfs {
-		partition-type = 0x83
-		bootable = "yes"
-		image = "rootfs.ext2"
-		size = 500M
-	}
+    partition rootfs {
+        partition-type = 0x83
+        bootable = "yes"
+        image = "rootfs.ext2"
+        size = 500M
+    }
 }
@@ -6,11 +6,11 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

 image sdcard.img {
+
 	hdimage {
 		gpt = true
 	}
@@ -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 {
@@ -1,29 +1,30 @@
 image efi-part.vfat {
-	vfat {
-		file EFI {
-			image = "efi-part/EFI"
-		}
-
-		file Image {
-			image = "Image"
-		}
-	}
-
-	size = 64M
+  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 {
-		partition-type = 0xEF
-		image = "efi-part.vfat"
-	}
+  partition boot {
+    partition-type = 0xEF
+    image = "efi-part.vfat"
+  }

-	partition root {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-	}
+  partition root {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
 }
@@ -17,13 +17,13 @@ Run the emulation with:

  qemu-system-aarch64 \
    -M sbsa-ref \
-    -cpu cortex-a57 \
+    -cpu cortex-a53 \
    -smp 4 \
    -m 1024 \
    -nographic \
    -pflash output/images/SBSA_FLASH0.fd \
    -pflash output/images/SBSA_FLASH1.fd \
-    -hda output/images/disk.img # qemu_aarch64_sbsa_defconfig
+    -hda output/images/disk.img

 Note that if you want to run sbsa-ref emulation with QEMU provided by
 your distro (i.e., not host-qemu by Buildroot) then you may need to
--- a/Show More
+++ b/Show More