Bump Buildroot to 2021.02-rc3 (#1260)

* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
2025-07-27 23:16:31 +00:00 · 2021-03-04 00:50:33 +01:00 · 2021-03-04 00:50:33 +01:00 · f358f322da
commit f358f322da
parent b77d633382
2130 changed files with 23612 additions and 21038 deletions
--- a/buildroot-external/configs/intel_nuc_defconfig
+++ b/buildroot-external/configs/intel_nuc_defconfig
@ -28,7 +28,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hasso
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@ -93,7 +93,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@ -29,7 +29,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hasso
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config"
 BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y
 BR2_PACKAGE_PROCPS_NG=y
--- a/buildroot-external/configs/rpi0_w_defconfig
+++ b/buildroot-external/configs/rpi0_w_defconfig
@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@ -61,6 +61,8 @@ BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_DROPBEAR_CLIENT=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 BR2_PACKAGE_NETWORK_MANAGER=y
+BR2_PACKAGE_NVME=y
+BR2_PACKAGE_STRESS_NG=y
 BR2_PACKAGE_TINI=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_DOCKER_CLI=y
@ -92,7 +94,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/rpi_defconfig
+++ b/buildroot-external/configs/rpi_defconfig
@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@ -96,7 +96,7 @@ BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
--- a/buildroot-patches/0001-docker-add-AppArmor-support.patch
+++ b/buildroot-patches/0001-docker-add-AppArmor-support.patch
@ -1,24 +1,22 @@
-From 53aff7f049c974ab861db563c24d31c5512d1fbc Mon Sep 17 00:00:00 2001
-Message-Id: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From f8074c7dbf7966fd15edd897130825684abe05e9 Mon Sep 17 00:00:00 2001
+Message-Id: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Mon, 13 Jan 2020 12:27:06 +0000
-Subject: [PATCH 1/9] docker: add AppArmor support
+Subject: [PATCH 1/5] docker: add AppArmor support

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 Signed-off-by: Stefan Agner <stefan@agner.ch>
 ---
 package/docker-containerd/docker-containerd.mk | 5 +++++
- package/docker-engine/docker-engine.mk         | 5 +++++
- package/runc/runc.mk                           | 5 +++++
- 3 files changed, 15 insertions(+)
+ 1 file changed, 5 insertions(+)

 diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
-index 6b79bd14ae..2eed6e346b 100644
+index 626889e5f4..7c74da708f 100644
 --- a/package/docker-containerd/docker-containerd.mk
 +++ b/package/docker-containerd/docker-containerd.mk
-@@ -18,6 +18,11 @@ DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
- 
- DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
+@@ -30,6 +30,11 @@ DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
+ DOCKER_CONTAINERD_TAGS += apparmor
+ endif
 
 +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
 +DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
@ -28,38 +26,6 @@ index 6b79bd14ae..2eed6e346b 100644
 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
 DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
 DOCKER_CONTAINERD_TAGS += seccomp
-diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
-index 8cedf307ba..7f898680b7 100644
--- a/package/docker-engine/docker-engine.mk
-+++ b/package/docker-engine/docker-engine.mk
-@@ -20,6 +20,11 @@ DOCKER_ENGINE_LDFLAGS = \
- DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
- DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
- 
-+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
-+DOCKER_ENGINE_DEPENDENCIES += libapparmor
-+DOCKER_ENGINE_TAGS += apparmor
-+endif
-+
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
- DOCKER_ENGINE_TAGS += seccomp
- DOCKER_ENGINE_DEPENDENCIES += libseccomp
-diff --git a/package/runc/runc.mk b/package/runc/runc.mk
-index 393bd7b22f..45fe1442ad 100644
--- a/package/runc/runc.mk
-+++ b/package/runc/runc.mk
-@@ -12,6 +12,11 @@ RUNC_LICENSE_FILES = LICENSE
- RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION)
- RUNC_TAGS = cgo static_build
- 
-+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
-+RUNC_DEPENDENCIES += libapparmor
-+RUNC_TAGS += apparmor
-+endif
-+
- ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
- RUNC_TAGS += seccomp
- RUNC_DEPENDENCIES += libseccomp host-pkgconf
 -- 
-2.30.0
+2.30.1

--- a/buildroot-patches/0002-network-manager-wpa_supplicant.patch
+++ b/buildroot-patches/0002-network-manager-wpa_supplicant.patch
@ -1,10 +1,10 @@
-From 15db6339b4bdd202c44c663edcdc82b6d2f07652 Mon Sep 17 00:00:00 2001
-Message-Id: <15db6339b4bdd202c44c663edcdc82b6d2f07652.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From b9f13255e5042fc4e8d64b73c2fccee6e7ca0674 Mon Sep 17 00:00:00 2001
+Message-Id: <b9f13255e5042fc4e8d64b73c2fccee6e7ca0674.1614713774.git.stefan@agner.ch>
+In-Reply-To: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
+References: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 16 Apr 2020 14:32:45 +0000
-Subject: [PATCH 3/9] network-manager: wpa_supplicant
+Subject: [PATCH 2/5] network-manager: wpa_supplicant

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@ -29,7 +29,7 @@ index 7d44768460..218dc860ff 100644
 	select BR2_PACKAGE_LIBNDP
 	help
 diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
-index 3dc3188f32..2a04b00cee 100644
+index 4b2ade5b9b..ad170cbe6f 100644
 --- a/package/network-manager/network-manager.mk
 +++ b/package/network-manager/network-manager.mk
@@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
@ -40,7 +40,7 @@ index 3dc3188f32..2a04b00cee 100644
 +	libgcrypt wpa_supplicant util-linux host-intltool readline libndp
 NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
 NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING
- 
+ NETWORK_MANAGER_SELINUX_MODULES = networkmanager
 -- 
-2.30.0
+2.30.1

--- a/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch
+++ b/buildroot-patches/0002-rpi-firmware-Bump-firmware.patch
@ -1,39 +0,0 @@
-From b24a9853bf61b59c44f5b5e0c02a41e07b6d776f Mon Sep 17 00:00:00 2001
-Message-Id: <b24a9853bf61b59c44f5b5e0c02a41e07b6d776f.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Thu, 16 Apr 2020 11:51:46 +0000
-Subject: [PATCH 2/9] rpi-firmware: Bump firmware
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
- package/rpi-firmware/rpi-firmware.hash | 2 +-
- package/rpi-firmware/rpi-firmware.mk   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
-index 8730ec959b..49a600903c 100644
--- a/package/rpi-firmware/rpi-firmware.hash
-+++ b/package/rpi-firmware/rpi-firmware.hash
-@@ -1,3 +1,3 @@
- # Locally computed
-sha256  c7a8c2b8cfe1977095d62086d340d6c15a383562aba2742e21df7f5f792aeb4b  rpi-firmware-358f4c271f2bc10931aae8fe0879ffaded8b9c44.tar.gz
-+sha256  e77016c80ec63ccd591f8aa4d46a5e27eddea1aaf3aedcd38098549588c32243  rpi-firmware-0d458874a89921fbe460e422b239695e1e101e2b.tar.gz
- sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
-diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
-index 8b2b2c7154..fe7a099407 100644
--- a/package/rpi-firmware/rpi-firmware.mk
-+++ b/package/rpi-firmware/rpi-firmware.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
-RPI_FIRMWARE_VERSION = 358f4c271f2bc10931aae8fe0879ffaded8b9c44
-+RPI_FIRMWARE_VERSION = 0d458874a89921fbe460e422b239695e1e101e2b
- RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
- RPI_FIRMWARE_LICENSE = BSD-3-Clause
- RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
-- 
-2.30.0
-
--- a/buildroot-patches/0003-Fix-dhcp-client.patch
+++ b/buildroot-patches/0003-Fix-dhcp-client.patch
@ -1,10 +1,10 @@
-From bd1542bc2e242b189b4a778cb879e3416c40b60a Mon Sep 17 00:00:00 2001
-Message-Id: <bd1542bc2e242b189b4a778cb879e3416c40b60a.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From 0bc96a0b5c81a8c42de169e41ba4d2f65161701d Mon Sep 17 00:00:00 2001
+Message-Id: <0bc96a0b5c81a8c42de169e41ba4d2f65161701d.1614713774.git.stefan@agner.ch>
+In-Reply-To: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
+References: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 16 Apr 2020 12:01:44 +0000
-Subject: [PATCH 4/9] Fix dhcp client
+Subject: [PATCH 3/5] Fix dhcp client

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@ -12,10 +12,10 @@ Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
-index ad59804d3b..f1ffa81d9a 100644
+index 988c7792dc..d8f331719a 100644
 --- a/package/dhcp/dhcp.mk
 +++ b/package/dhcp/dhcp.mk
-@@ -76,8 +76,7 @@ endif
+@@ -77,8 +77,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
 define DHCP_INSTALL_CLIENT
@ -26,5 +26,5 @@ index ad59804d3b..f1ffa81d9a 100644
 		install-sbinPROGRAMS
 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
 -- 
-2.30.0
+2.30.1

--- a/buildroot-patches/0004-docker-proxy-Bump-version.patch
+++ b/buildroot-patches/0004-docker-proxy-Bump-version.patch
@ -1,10 +1,10 @@
-From dc54a32cb53394e21bc5dd65c10a847944864a2b Mon Sep 17 00:00:00 2001
-Message-Id: <dc54a32cb53394e21bc5dd65c10a847944864a2b.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
+From 4264663b7fdb1379c10bd2b2844c32c617dfb9ec Mon Sep 17 00:00:00 2001
+Message-Id: <4264663b7fdb1379c10bd2b2844c32c617dfb9ec.1614713774.git.stefan@agner.ch>
+In-Reply-To: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
+References: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
 From: Pascal Vizeli <pvizeli@syshack.ch>
 Date: Thu, 7 May 2020 09:02:05 +0000
-Subject: [PATCH 7/9] docker-proxy: Bump version
+Subject: [PATCH 4/5] docker-proxy: Bump version

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
@ -37,5 +37,5 @@ index 6600b24ed9..d0e940db93 100644
 DOCKER_PROXY_LICENSE = Apache-2.0
 DOCKER_PROXY_LICENSE_FILES = LICENSE
 -- 
-2.30.0
+2.30.1

--- a/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch
+++ b/buildroot-patches/0005-package-rpi-firmware-Allow-to-deploy-multiple-firmwa.patch
@ -0,0 +1,76 @@
+From 49e3db2dafa620dcbb11c1ed68f442aa8fd4696f Mon Sep 17 00:00:00 2001
+Message-Id: <49e3db2dafa620dcbb11c1ed68f442aa8fd4696f.1614713774.git.stefan@agner.ch>
+In-Reply-To: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
+References: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
+From: Stefan Agner <stefan@agner.ch>
+Date: Mon, 8 Feb 2021 14:08:28 +0100
+Subject: [PATCH 5/5] package/rpi-firmware: Allow to deploy multiple firmware
+ files
+
+Add a new config option to allow a specific list of firmware files to be
+deployed. This is useful if the system needs to decide at runtime which
+firmware to use.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+---
+ package/rpi-firmware/Config.in       | 10 ++++++++++
+ package/rpi-firmware/rpi-firmware.mk | 17 +++++++++++++++--
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
+index f5a25c5680..ce31ad46de 100644
+--- a/package/rpi-firmware/Config.in
+++ b/package/rpi-firmware/Config.in
+@@ -58,8 +58,18 @@ config BR2_PACKAGE_RPI_FIRMWARE_CD
+ 	  The cut-down firmware, for emergency situations, with only
+ 	  features required to boot a Linux kernel.
+ 
+config BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST
+	bool "deploy firmware files from list"
+	help
+	  Deploy firmware files as listed.
+
+ endchoice
+ 
+config BR2_PACKAGE_RPI_FIRMWARE_LIST
+	string
+	default "start.elf start_x.elf start_cd.elf fixup.dat fixup_x.dat fixup_cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI
+	default "start4.elf start4x.elf start4cd.elf fixup4.dat fixup4x.dat fixup4cd.dat" if BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
+
+ config BR2_PACKAGE_RPI_FIRMWARE_BOOT
+ 	string
+ 	default ""      if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT && BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI
+diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
+index f3d28ef825..58085a8ca8 100644
+--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
+@@ -48,11 +48,24 @@ define RPI_FIRMWARE_INSTALL_BOOTCODE_BIN
+ endef
+ endif
+ 
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_LIST),y)
+define RPI_FIRMWARE_INSTALL_FIRMWARE
+	$(foreach firmware,$(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_LIST)), \
+		$(INSTALL) -D -m 0644 $(@D)/boot/$(firmware) $(BINARIES_DIR)/rpi-firmware/$(firmware)
+	)
+endef
+else
+define RPI_FIRMWARE_INSTALL_FIRMWARE
+	$(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf
+	$(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+endef
+endif
+
+
+ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS
+ 	$(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt
+ 	$(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt
+-	$(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf
+-	$(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat
+	$(RPI_FIRMWARE_INSTALL_FIRMWARE)
+ 	$(RPI_FIRMWARE_INSTALL_BOOTCODE_BIN)
+ 	$(RPI_FIRMWARE_INSTALL_DTB)
+ 	$(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS)
+-- 
+2.30.1
+
--- a/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch
+++ b/buildroot-patches/0005-rpi-use-latest-wifi-driver.patch
@ -1,48 +0,0 @@
-From ff288c78226a2e61abf75bb285b429299e384edd Mon Sep 17 00:00:00 2001
-Message-Id: <ff288c78226a2e61abf75bb285b429299e384edd.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Thu, 16 Apr 2020 12:05:21 +0000
-Subject: [PATCH 5/9] rpi: use latest wifi driver
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
- package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-index b8931d2c45..68e33debba 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-@@ -1,3 +1,3 @@
- # Locally calculated
-sha256  05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a  rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
-+sha256  26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3   rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz
- sha256  b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d   LICENCE.broadcom_bcm43xx
-diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-index 6be02509fe..0c697bddbe 100644
--- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-@@ -4,14 +4,14 @@
- #
- ################################################################################
- 
-RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
-RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
-+RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639
-+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
- RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
- RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
- 
- define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
- 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
-	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
-+	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
- endef
- 
- $(eval $(generic-package))
-- 
-2.30.0
-
--- a/buildroot-patches/0006-ODROID-XU4-video-firmware.patch
+++ b/buildroot-patches/0006-ODROID-XU4-video-firmware.patch
@ -1,50 +0,0 @@
-From 4526121b86b259e426766c4ba35b2911b2c0965c Mon Sep 17 00:00:00 2001
-Message-Id: <4526121b86b259e426766c4ba35b2911b2c0965c.1607000394.git.stefan@agner.ch>
-In-Reply-To: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1607000394.git.stefan@agner.ch>
-References: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1607000394.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Wed, 11 Nov 2020 22:16:10 +0100
-Subject: [PATCH 6/7] ODROID-XU4: video firmware
-
---
- package/linux-firmware/Config.in         | 6 ++++++
- package/linux-firmware/linux-firmware.mk | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
-index 105daf42b8..109af152f8 100644
--- a/package/linux-firmware/Config.in
-+++ b/package/linux-firmware/Config.in
-@@ -44,6 +44,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO
- 	help
- 	  Firmware files for Qualcomm Adreno GPU firmware
- 
-+
-+config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8
-+	bool "Samsung MFC video encoder/decoder driver v8"
-+	help
-+	  Firmware files for samsung MFC video encoder/decoder driver v8
-+
- endmenu # Video
- 
- menu "Bluetooth firmware"
-diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
-index 8808b5284c..f1c84a134d 100644
--- a/package/linux-firmware/linux-firmware.mk
-+++ b/package/linux-firmware/linux-firmware.mk
-@@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a*
- LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt
- endif
- 
-+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8),y)
-+LINUX_FIRMWARE_FILES += s5p-mfc-v8.fw
-+# No license file; the license is in the file WHENCE
-+# which is installed unconditionally
-+endif
-+
- # Intel Wireless Bluetooth
- ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y)
- LINUX_FIRMWARE_FILES += intel/ibt-*
-- 
-2.29.2
-
--- a/buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch
+++ b/buildroot-patches/0006-package-linux-firmware-add-new-option-for-Samsung-MF.patch
@ -1,54 +0,0 @@
-From 3a34b131d0d7a1630e70f60c3bd62240d3b1b654 Mon Sep 17 00:00:00 2001
-Message-Id: <3a34b131d0d7a1630e70f60c3bd62240d3b1b654.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Wed, 11 Nov 2020 22:16:10 +0100
-Subject: [PATCH 6/9] package/linux-firmware: add new option for Samsung MFC
- firmware
-
-Multi format codec (MFC) is the IP present in Samsung Exynos
-series SoCs for video encoding/decoding operations.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
---
- package/linux-firmware/Config.in         | 5 +++++
- package/linux-firmware/linux-firmware.mk | 6 ++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
-index 105daf42b8..dbdfdb52b3 100644
--- a/package/linux-firmware/Config.in
-+++ b/package/linux-firmware/Config.in
-@@ -44,6 +44,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO
- 	help
- 	  Firmware files for Qualcomm Adreno GPU firmware
- 
-+config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8
-+	bool "Samsung MFC video encoder/decoder v8 firmware"
-+	help
-+	  Firmware files for Samsung MFC video encoder/decoder driver v8
-+
- endmenu # Video
- 
- menu "Bluetooth firmware"
-diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
-index 8808b5284c..f1c84a134d 100644
--- a/package/linux-firmware/linux-firmware.mk
-+++ b/package/linux-firmware/linux-firmware.mk
-@@ -39,6 +39,12 @@ LINUX_FIRMWARE_FILES += qcom/a*
- LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom qcom/NOTICE.txt
- endif
- 
-+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8),y)
-+LINUX_FIRMWARE_FILES += s5p-mfc-v8.fw
-+# No license file; the license is in the file WHENCE
-+# which is installed unconditionally
-+endif
-+
- # Intel Wireless Bluetooth
- ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y)
- LINUX_FIRMWARE_FILES += intel/ibt-*
-- 
-2.30.0
-
--- a/buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch
+++ b/buildroot-patches/0008-systemd-Bump-to-latest-systemd-stable-release-246.10.patch
@ -1,82 +0,0 @@
-From 6ca8035a4ffbb4e6de6fd128a1e6a638bb974f11 Mon Sep 17 00:00:00 2001
-Message-Id: <6ca8035a4ffbb4e6de6fd128a1e6a638bb974f11.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Sun, 20 Dec 2020 16:57:09 +0100
-Subject: [PATCH 8/9] systemd: Bump to latest systemd-stable release 246.10
-
---
- ...o-not-fail-with-read-only-etc-or-var.patch | 34 -------------------
- package/systemd/systemd.hash                  |  2 +-
- package/systemd/systemd.mk                    |  2 +-
- 3 files changed, 2 insertions(+), 36 deletions(-)
- delete mode 100644 package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
-
-diff --git a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
-deleted file mode 100644
-index 01e7f1e906..0000000000
--- a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
-From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001
-From: Felix Riemann <felix.riemann@sma.de>
-Date: Mon, 19 Oct 2020 18:54:53 +0200
-Subject: [PATCH] update-done: Do not fail with read-only /etc or /var
-
-With the switch from log_debug() to log_debug_errno() in commit c413bb28df
-systemd-update-done would fail without any error message if /etc
-or /var were read-only. This restores the previous behaviour to
-silently ignore these directories again.
-
-[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/update-done/update-done.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
-index e9d589e0e5..92c348d83b 100644
---- a/src/update-done/update-done.c
-+++ b/src/update-done/update-done.c
-@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
- 
-         r = write_string_file_atomic_label_ts(path, message, ts);
-         if (r == -EROFS)
--                return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
--        if (r < 0)
-+                log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
-+        else if (r < 0)
-                 return log_error_errno(r, "Failed to write \"%s\": %m", path);
-         return 0;
- }
--- 
-2.25.4
-
-diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
-index cad249199c..0c2ba1e1c3 100644
--- a/package/systemd/systemd.hash
-+++ b/package/systemd/systemd.hash
-@@ -1,5 +1,5 @@
- # sha256 locally computed
-sha256  f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178  systemd-246.5.tar.gz
-+sha256  3a972d287edd864e0b33321bc74dfe6083d390306461fa7e958895eaa4be6b67  systemd-246.10.tar.gz
- sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  LICENSE.GPL2
- sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENSE.LGPL2.1
- sha256  b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9  README
-diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
-index ddd3f4380e..51a3160050 100644
--- a/package/systemd/systemd.mk
-+++ b/package/systemd/systemd.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
-SYSTEMD_VERSION = 246.5
-+SYSTEMD_VERSION = 246.10
- SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
- SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
- SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
-- 
-2.30.0
-
--- a/buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch
+++ b/buildroot-patches/0009-package-linux-firmware-add-new-option-for-USB-TI-341.patch
@ -1,53 +0,0 @@
-From 5296f74bba93a16fe1db5493f36e35fad434f9ee Mon Sep 17 00:00:00 2001
-Message-Id: <5296f74bba93a16fe1db5493f36e35fad434f9ee.1612369715.git.stefan@agner.ch>
-In-Reply-To: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-References: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch>
-From: Stefan Agner <stefan@agner.ch>
-Date: Wed, 23 Dec 2020 10:53:20 +0100
-Subject: [PATCH 9/9] package/linux-firmware: add new option for USB TI
- 3410/5052 firmware
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
---
- package/linux-firmware/Config.in         | 9 +++++++++
- package/linux-firmware/linux-firmware.mk | 6 ++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
-index dbdfdb52b3..6d5e961527 100644
--- a/package/linux-firmware/Config.in
-+++ b/package/linux-firmware/Config.in
-@@ -490,4 +490,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X
- 
- endmenu
- 
-+menu "USB to Serial Firmware"
-+
-+config BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI
-+	bool "USB TI 3410/5052 Serial Firmware"
-+	help
-+	  Firmware files for TI 3410/5052
-+
-+endmenu
-+
- endif
-diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
-index f1c84a134d..f00fb2e6ae 100644
--- a/package/linux-firmware/linux-firmware.mk
-+++ b/package/linux-firmware/linux-firmware.mk
-@@ -620,6 +620,12 @@ LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin
- LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
- endif
- 
-+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_USB_SERIAL_TI),y)
-+LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw
-+# No license file; the license is in the file WHENCE
-+# which is installed unconditionally
-+endif
-+
- ifneq ($(LINUX_FIRMWARE_FILES),)
- define LINUX_FIRMWARE_INSTALL_FILES
- 	cd $(@D) && \
-- 
-2.30.0
-
--- a/buildroot/.flake8
+++ b/buildroot/.flake8
@ -2,4 +2,4 @@
 exclude=
    # copied from the kernel sources
    utils/diffconfig
-max-line-length=80
+max-line-length=132
--- a/buildroot/CHANGES
+++ b/buildroot/CHANGES
@ -1,3 +1,130 @@
+2021.02-rc3, released February 27th, 2021
+
+	Fixes all over the tree.
+
+	utils/scanpypi: Explicitly use python3 to ensure compatiblity
+	with packages having python3-only code in setup.py
+
+	support/download: Ensure sub-second timestamp precision is
+	dropped when creating a tarball from a (subversion) repo, as
+	that is not representable in the PAX tar format
+
+	Updated/fixed packages: babeltrace2, bind, botan, brltty,
+	cegui, elfutils, fakeroot, imagemagick, intel-mediasdk,
+	irqbalance, libglib2, libselinux, libusb, libuwsc, nodejs,
+	open62541, openldap, ply, python-aiohttp, python-django,
+	python3, qemu, readline, rust, screen, taglib, unbound, xterm
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13516: utils/scanpypi: Failure when parsing diffoscope
+	#13541: 2021.02.rc2: irqbalance: Daemon couldn't be bound to...
+	#13561: Create a new user defining users-table.txt not working..
+
+2021.02-rc2, released February 16th, 2021
+
+	Fixes all over the tree.
+
+	Vulnerability scanning: cpedb.py: Drop CPE XML database
+	caching, as it did not speed up processing much and uses a lot
+	of additional memory.
+	pkg-stats: include information about ignored CVEs in JSON
+	output
+
+	Fakeroot: Fix compatibility issue with glibc 2.33
+
+	Updated/fixed packages: can-utils, collectd, dnsmaqs,
+	docker-cli, docker-engine, ebtables, fakeroot, flashrom,
+	gdk-pixbuf, go, gst1-python, jasper, kodi,
+	kodi-inputstream-adaptive, lcms2, libgeos, libgpg-error,
+	libopenssl, mongoose, mpd, ne10, netopeer2, openblas, orc,
+	perl-gd, ply, postgresql, protobuf, subversion, tcpdump,
+	tzdate, uboot-tools, wireshark, webkitgtk, wpewebkit, xterm
+
+	New packages: perl-extutils-pkgconfig
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11706: binman (U-boot tool) cannot find libfdt "binman: No mod..
+
+2021.02-rc1, released February 9th, 2021
+
+	Fixes all over the tree and new features.
+
+	Toolchain: Default to binutils 2.35.2, add 2.36.1, drop
+	2.33.x. Fix GCC 10.x ARC adc/sbc pattern handling, Update ARM
+	toolchains to 10.2-2020.11 release.
+
+	Architectures: ARC: add support for generic HS48 processor,
+	PPC: drop PPC601 support, which was removed from Linux 5.10.
+
+	Vulnerability scanning: The CVE checking logic has been
+	extended to match packages based on CPE (Common Platform
+	Enumeration) IDs for more accurate matching, and CPE
+	identifiers have been added for a large amount of packages.
+
+	Download: Rework the tarball creation logic (E.G. when a
+	package is fetched from a git/svn repo) to no longer require a
+	host-tar <= 1.29. To differ between the old and the new
+	format, the new tarballs have gained a -br1 suffix
+	(<pkg>-<version>-br1.tar.gz).
+
+	SELinux support: A significant number of packages now pull in
+	the relevant refpolicy modules when enabled.
+
+	New defconfigs: arrow avenger96, bananapi M1+, microchip
+	sam9x60ek, pine64 rock64
+
+	Removed defconfigs: QEMU ppc virtex-ml507
+
+	New packages: balena-engine, casync, coremark, coremark-pro,
+	datatables, datatables-buttons, datatables-fixedcolumns,
+	datatables-responsive, delve, frotz, gkrellm, inih, jszip,
+	libgeos, libiec61850, libmdbx, lualdap, neofetch,
+	nvidia-modprobe, open62541, perl-devel-cycle, perl-devel-size,
+	perl-math-int64, ply, popperjs, python-bleak,
+	python-defusedxml, python-pycups, python-pytest-asyncio,
+	python-typing-extensions, qcom-db410c-firmware, qt5coap,
+	qt5knx, qt5mqtt, quickjs, rcw-smarc-sal28, screenfetch,
+	ssdp-responder, tpm2-pkcs11, wqy-zenhei, xorcurses
+
+	Removed packages: audiofile, boa, ipsec-tools, libupnp18,
+	ti-sgx-libgdbm
+
+	Renamed rcw package to qoriq-rcw
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13316: beaglebone_qt5_defconfig: PowerVR fails to start
+	#13416: dhcpcd start warning message: no such user dhcpcd
+	#13456: ccache prevents build
+	#13471: package/mpd/mpd.conf make use of path not created
+	#13506: BR2_PACKAGE_DHCPCD missing directory creation
+
+2020.11.3, released February 17th, 2021
+
+	meson: Fix ccache detection handling when per-package builds
+	are used.
+
+	Fakeroot: Fix compatibility issue with glibc 2.33
+
+	Updated/fixed packages: atftp, binutils, busybox, cereal,
+	chartjs, connman, dhcpcd, dnsmasq, docker-cli, docker-engine,
+	ebtables, fakeroot, flashrom, go, gst1-python, guile,
+	intel-mediadriver, intel-microcode, jasper,
+	kodi-inputstream-adaptive, lcms2, libbsd, libopenssl,
+	makedumpfile, memtester, mosquitto, ne10, openblas, orc, php,
+	postgresql, privoxy, pugixml, python-bottle, python-django,
+	python3, rauc, sox, stress-ng, subversion, tzdata,
+	uboot-tools, uclibc, webkitgtk, wireguard-linux-compat,
+	wireshark, wpa_supplicant, wpewebkit, xenomai,
+	xserver_xorg-server, xterm
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11706: binman (U-boot tool) cannot find libfdt "binman: No mod..
+	#13506: BR2_PACKAGE_DHCPCD missing directory creation
+
 2020.11.2, released January 31st, 2021

 	Important / security related fixes.
@ -205,6 +332,42 @@
 	#13236: Can't compile linux 5.4.8 (with gcc 10 on host)
 	#13286: The system hangs in vmware workstation on the line..

+2020.08.3, released December 27th, 2020
+
+	Important / security related fixes.
+
+	Infrastructure:
+	- cmake: fix host ccache handling for CMake 3.19
+	- meson: Forcibly disable binary stripping for
+	  target builds, enable for host builds
+	- golang: Fix HOST / TARGET directories for per-package builds
+
+	Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues
+
+	Updated/fixed packages: apitrace, arm-trusted-firmware,
+	bustle, c-ares, ca-certificates, cage, cdrkit, cryptopp,
+	dhcpcd, docker-containerd, dtv-scan-tables, flare-engine,
+	ghostscript, gvfs, haproxy, imagemagick, imx-gpu-viv, jasper,
+	jemalloc, jpeg-turbo, libcamera, libcap, libcurl, libglib2,
+	libgpiod, libkrb5, libopenssl, libplist, libressl, libuv,
+	libuvw, lynx, mariadb, mbedtls, minidlna, mongodb, monkey,
+	musl, mutt, ncurses, netsnmp, netsurf, nodejs, opencv3,
+	openldap, openrc, opkg-utils, paho-mqtt-c, php, privoxy,
+	proftpd, python-crc16, python-flask-cors, python-lxml,
+	python-pip, python-pyparsing, python-pyqt5, qemu, qt5base,
+	raptor, rauc, ruby, setserial, shadowsocks-libev, slirp,
+	sqlcipher, thermald, ti-sgx-demos, tinycbor, unbound, vsftpd,
+	wireless-regdb, wireshark, wlroots, x11vnc, xen, xinetd,
+	xserver_xorg-server
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13276: libcap builds libcap.pc incorrectly
+	#13316: beaglebone_qt5_defconfig: PowerVR fails to start
+	#13336: thermald-1.9.1 compilation failure with musl 1.2.1
+	#13341: Mistake in /etc/init.d/S70vsftpd
+	#13416: dhcpcd start warning message: no such user dhcpcd
+
 2020.08.2, released November 16th, 2020

 	Important / security related fixes.
@ -739,6 +902,97 @@
 	#12796: Update OpenSSL to Version 1.1.1g to patch  CVE-2020-1967
 	#12811: bootstrap stuck and no login prompt

+2020.02.11, released February 17, 2021
+
+	Important / security related fixes.
+
+	meson: Fix ccache detection handling when per-package builds
+	are used.
+
+	Fakeroot: Fix compatibility issue with glibc 2.33
+
+	Updated/fixed packages: atftp, busybox, cereal, connman,
+	dhcpcd, dnsmasq, docker-cli, docker-engine, fakeroot,
+	intel-mediadriver, intel-microcode, jasper,
+	kodi-inputstream-adaptive, libbsd, libopenssl, linux-headers,
+	mosquitto, orc, php, postgresql, privoxy, pugixml,
+	python-bottle, python-django, python3, rauc, sox, subversion,
+	tzdata, wireguard-linux-compat, wpa_supplicant, xenomai, xterm
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13506: BR2_PACKAGE_DHCPCD missing directory creation
+
+2020.02.10, released January 31st, 2021
+
+	Important / security related fixes.
+
+	Download: Ensure git submodules are correctly fetched if
+	enabled for a package with <pkg>_GIT_SUBMODULES = YES and the
+	host variant is downloaded first.
+
+	Toolchain: Mark CodeSourcery Aarch64 2014.11 toolchain as not
+	having libatomic.
+
+	pkg-stats: Fix python 3.8+ deprecation warning.
+
+	meson: Ensure ccache is not detected and used, as it may
+	conflict with the ccache handling in Buildroot.
+
+	New packages: libnpupnp
+
+	Updated/fixed packages: bctoolbox, brltty, dbus, dovecot,
+	dovecot-pigeonhole, gcc, gerbera, gmrender-resurrect, gst-omx,
+	gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good,
+	gst1-plugins-ugly, gst1-rtsp-server, gst1-vaapi,
+	gst1-validate, gstreamer1, gstreamer1-editing-services,
+	igd2-for-linux, libclc, libllcp, libtorrent-rasterbar,
+	libupnp, libupnpp, lpc32xxcdl, luarocks, mpd, nfs-utils,
+	nodejs, openjpeg, openldap, opentracing-cpp, openvpn, p11-kit,
+	paho-mqtt-c, php, poppler, postgresql, python3, runc, sudo,
+	syslog-ng, systemd, tini, trace-cmd, tzdata, ushare, vlc,
+	wavpack, wireguard-linux-compat, wolfssl, xapp_xload, xorriso,
+	zic
+
+	Removed packages: libupnp18
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13471: package/mpd/mpd.conf make use of path not created
+
+2020.02.9, released December 27th, 2020
+
+	Important / security related fixes.
+
+	Infrastructure:
+	- cmake: fix host ccache handling for CMake 3.19
+	- meson: Forcibly disable binary stripping for
+	  target builds, enable for host builds
+	- golang: Fix HOST / TARGET directories for per-package builds
+
+	Defconfigs: Beaglebone Qt5: Fix ti-sgx related issues
+
+	Updated/fixed packages: apitrace, arm-trusted-firmware,
+	bustle, c-ares, ca-certificates, cdrkit, cryptopp, dhcpcd,
+	docker-containerd, dtv-scan-tables, flare-engine, ghostscript,
+	haproxy, imagemagick, imx-gpu-viv, jasper, jemalloc,
+	jpeg-turbo, libcap, libcurl, libglib2, libgpiod, libkrb5,
+	libopenssl, libplist, libressl, libuv, libuvw, lynx, mariadb,
+	mbedtls, minidlna, monkey, musl, mutt, ncurses, netsnmp,
+	nodejs, opencv3, openldap, openrc, opkg-utils, paho-mqtt-c,
+	php, privoxy, proftpd, python-crc16, python-flask-cors,
+	python-lxml, python-pip, python-pyparsing, python-pyqt5, qemu,
+	qt5base, raptor, rauc, ruby, setserial, shadowsocks-libev,
+	slirp, sqlcipher, ti-sgx-demos, tinycbor, vsftpd,
+	wireless-regdb, wireshark, x11vnc, xen, xinetd,
+	xserver_xorg-server
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#13276: libcap builds libcap.pc incorrectly
+	#13316: beaglebone_qt5_defconfig: PowerVR fails to start
+	#13341: Mistake in /etc/init.d/S70vsftpd
+
 2020.02.8, released November 16th, 2020

 	Important / security related fixes.
--- a/buildroot/Config.in.legacy
+++ b/buildroot/Config.in.legacy
@ -144,7 +144,29 @@ endif

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

-comment "Legacy options removed in 2020.11"
+comment "Legacy options removed in 2021.02"
+
+config BR2_PACKAGE_MPD_AUDIOFILE
+	bool "mpd audiofile support removed"
+	select BR2_LEGACY
+	help
+	  The audiofile support was removed from mpd as audiofile is
+	  affected by multiple CVEs and is not maintained anymore (no
+	  release since 2013).
+
+config BR2_PACKAGE_AUDIOFILE
+	bool "audiofile package removed"
+	select BR2_LEGACY
+	help
+	  The audiofile package was removed as it is affected by
+	  multiple CVEs and is not maintained anymore (no release since
+	  2013).
+
+config BR2_BINUTILS_VERSION_2_33_X
+	bool "binutils 2.33.x has been removed"
+	select BR2_LEGACY
+	help
+	  binutils 2.33.x has been removed, use a newer version.

 config BR2_PACKAGE_LIBUPNP18
 	bool "libupnp18 package removed"
@ -156,6 +178,74 @@ config BR2_PACKAGE_LIBUPNP18
 	  CVE-2020-12695. The libupnp package (which has been updated to
 	  version 1.14.x) has been selected instead.

+config BR2_PACKAGE_BOA
+	bool "boa package removed"
+	select BR2_LEGACY
+	help
+	  The boa package was removed as it is affected by multiple
+	  CVEs and is not maintained anymore (no release since 2005).
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
+	bool "imx sdma firmware is provided by firmware-imx"
+	select BR2_LEGACY
+	select BR2_PACKAGE_FREESCALE_IMX
+	select BR2_PACKAGE_FIRMWARE_IMX
+	help
+	  linux-firmware provide the same firmware as firmware-imx.
+	  We prefer using firmware-imx as the only provider.
+
+config BR2_GDB_VERSION_8_2
+	bool "gdb 8.2.x has been removed"
+	select BR2_LEGACY
+	help
+	  gdb 8.2 support has been removed, you can use a newer
+	  version such as 8.3 or more recent.
+
+config BR2_PACKAGE_HOST_RCW
+	bool "rcw package was renamed to qoriq-rcw"
+	select BR2_PACKAGE_HOST_QORIQ_RCW
+	select BR2_LEGACY
+	help
+	  The rcw package was specific to the QorIQ platform, so it has
+	  been renamed to qoriq-rcw, to leave room for other *-rcw
+	  packages for other platforms.
+
+config BR2_KERNEL_HEADERS_5_9
+	bool "kernel headers version 5.9.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.9.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
+config BR2_KERNEL_HEADERS_5_8
+	bool "kernel headers version 5.8.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.8.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
+config BR2_powerpc_601
+	bool "PowerPC 601 support removed"
+	select BR2_LEGACY
+	help
+	  The support for the PowerPC 601 processors has been removed.
+
+config BR2_PACKAGE_TI_SGX_LIBGBM
+	bool "ti-sgx-libgbm support removed"
+	select BR2_LEGACY
+	help
+	  TI has merged the ti-sgx-libgbm package with the ti-sgx-um
+	  package
+
+config BR2_PACKAGE_IPSEC_TOOLS
+	bool "ipsec-tools package was removed"
+	select BR2_LEGACY
+	help
+	  This package has been removed as it has security issues and
+	  has been abandoned since 2014.
+
+comment "Legacy options removed in 2020.11"
+
 config BR2_PACKAGE_OPENCV
 	bool "opencv package was removed"
 	select BR2_LEGACY
--- a/buildroot/DEVELOPERS
+++ b/buildroot/DEVELOPERS
@ -131,6 +131,9 @@ F:	package/openal/
 F:	package/p7zip/
 F:	package/wine/

+N:	Andreas Klinger <ak@it-klinger.de>
+F:	package/ply/
+
 N:	Andrey Smirnov <andrew.smirnov@gmail.com>
 F:	package/python-backports-shutil-get-terminal-size/
 F:	package/python-decorator/
@ -169,6 +172,9 @@ F:	package/python-pillow/
 F:	package/python-pydal/
 F:	package/python-spidev/
 F:	package/python-web2py/
+F:	package/qt5/qt5coap/
+F:	package/qt5/qt5knx/
+F:	package/qt5/qt5mqtt/
 F:	package/sam-ba/
 F:	package/sshguard/
 F:	package/sunwait/
@ -321,10 +327,12 @@ F:	package/freetype/
 F:	package/fstrcmp/
 F:	package/ghostscript/
 F:	package/giflib/
+F:	package/gkrellm/
 F:	package/gli/
 F:	package/glmark2/
 F:	package/gpsd/
 F:	package/hdparm/
+F:	package/inih/
 F:	package/jsoncpp/
 F:	package/kodi*
 F:	package/lame/
@ -490,6 +498,8 @@ F:	configs/olimex_a13_olinuxino_defconfig
 F:	configs/orangepi_plus_defconfig

 N:	Chris Packham <judge.packham@gmail.com>
+F:	package/coremark/
+F:	package/coremark-pro/
 F:	package/gstreamer1/gst1-shark/
 F:	package/micropython/
 F:	package/micropython-lib/
@ -503,6 +513,7 @@ F:	linux/linux-ext-aufs.mk
 F:	package/aufs/
 F:	package/aufs-util/
 F:	package/batman-adv/
+F:	package/delve/
 F:	package/docker-cli/
 F:	package/docker-containerd/
 F:	package/docker-engine/
@ -864,6 +875,7 @@ F:	package/ncmpc/
 F:	package/oniguruma/
 F:	package/oprofile/
 F:	package/pcmanfm/
+F:	package/perl-extutils-pkgconfig/
 F:	package/python-backcall/
 F:	package/python-jedi/
 F:	package/python-parso/
@ -884,6 +896,10 @@ F:	configs/freescale_imx6ullevk_defconfig
 N:	Falco Hyfing <hyfinglists@gmail.com>
 F:	package/python-pymodbus/

+N:	Filip Skoneczny <fskoneczny@gmail.com>
+F:	board/sinovoip/m1-plus
+F:	configs/bananapi_m1_plus_defconfig
+
 N:	Floris Bos <bos@je-eigen-domein.nl>
 F:	package/ipmitool/
 F:	package/odhcploc/
@ -921,6 +937,7 @@ F:	package/netsurf/
 F:	package/perl*
 F:	package/pkg-perl.mk
 F:	package/pkg-luarocks.mk
+F:	package/quickjs/
 F:	package/rings/
 F:	package/tekui/
 F:	package/wpebackend-fdo/
@ -929,6 +946,7 @@ F:	package/wsapi/
 F:	package/wsapi-fcgi/
 F:	package/wsapi-xavante/
 F:	package/xavante/
+F:	support/testing/tests/package/test_lua*
 F:	utils/scancpan

 N:	Frank Hunleth <fhunleth@troodon-software.com>
@ -983,6 +1001,7 @@ N:	Gilles Talis <gilles.talis@gmail.com>
 F:	board/freescale/imx8mmevk/
 F:	configs/freescale_imx8mmevk_defconfig
 F:	package/cctz/
+F:	package/faad2/
 F:	package/fdk-aac/
 F:	package/httping/
 F:	package/iozone/
@ -991,6 +1010,7 @@ F:	package/libeXosip2/
 F:	package/libolm/
 F:	package/libosip2/
 F:	package/ocrad/
+F:	package/opusfile/
 F:	package/restclient-cpp/
 F:	package/tesseract-ocr/
 F:	package/webp/
@ -1033,11 +1053,6 @@ F:	package/python-redis/
 F:	package/python-rpi-ws281x/
 F:	package/python-wtforms/

-N:	Guillaume Gardet <guillaume.gardet@oliseo.fr>
-F:	package/c-icap/
-F:	package/c-icap-modules/
-F:	package/sdl2/
-
 N:	Guillaume William Brs <guillaume.bressaix@gmail.com>
 F:	package/libnids/
 F:	package/liquid-dsp/
@ -1267,6 +1282,7 @@ F:	configs/globalscale_espressobin_defconfig
 F:	board/globalscale/espressobin/
 F:	package/mg/
 F:	package/netcalc/
+F:	package/ssdp-responder/

 N:	Joao Pinto <jpinto@synopsys.com>
 F:	board/synopsys/vdk/
@ -1374,6 +1390,7 @@ F:	package/libnss/
 F:	package/lld/
 F:	package/llvm/
 F:	package/python-cython/
+F:	package/python-pycups/
 F:	package/python-raven/
 F:	package/python-schedule/
 F:	package/python-sentry-sdk/
@ -1460,6 +1477,9 @@ F:	package/ramsmp/
 N:	Kieran Bingham <kieran.bingham@ideasonboard.com>
 F:	package/libcamera/

+N:	Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
+F:	package/wqy-zenhei/
+
 N:	Koen Martens <gmc@sonologic.nl>
 F:	package/capnproto/
 F:	package/linuxconsoletools/
@ -1482,6 +1502,9 @@ N:	Leon Anavi <leon.anavi@konsulko.com>
 F:	board/olimex/a10_olinuxino
 F:	configs/olimex_a10_olinuxino_lime_defconfig

+N:	Leonid Yuriev <leo@yuriev.ru>
+F:	package/libmdbx/
+
 N:	Lionel Flandrin <lionel@svkt.org>
 F:	package/python-babel/
 F:	package/python-daemonize/
@ -1499,7 +1522,6 @@ F:	configs/bananapi_m2_ultra_defconfig
 F:	configs/beaglebone_defconfig
 F:	configs/beaglebone_qt5_defconfig
 F:	package/ti-sgx-demos/
-F:	package/ti-sgx-libgbm/
 F:	package/ti-sgx-km/
 F:	package/ti-sgx-um/

@ -1547,6 +1569,7 @@ F:	configs/olpc_xo175_defconfig

 N:	Ludovic Desroches <ludovic.desroches@microchip.com>
 F:	board/atmel/
+F:	board/microchip/
 F:	configs/at91*
 F:	configs/atmel_*
 F:	configs/microchip_*
@ -1591,17 +1614,22 @@ F:	package/luaossl/
 F:	package/murata-cyw-fw/
 F:	package/netdata/
 F:	package/python-ansicolors/
+F:	package/python-bleak/
 F:	package/python-iniconfig/
 F:	package/python-intelhex/
 F:	package/python-packaging/
 F:	package/python-pluggy/
 F:	package/python-pytest/
+F:	package/python-pytest-asyncio/
+F:	package/python-typing-extensions/
 F:	package/python-xmodem/
 F:	package/rs485conf/
 F:	package/turbolua/
 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_pytest.py
+F:	support/testing/tests/package/test_python_pytest_asyncio.py

 N:	Marcus Folkesson <marcus.folkesson@gmail.com>
 F:	package/libostree/
@ -1743,8 +1771,8 @@ F:	package/python-pyrex/
 F:	package/python-pysftp/
 F:	package/python-tinyrpc/
 F:	package/python-txdbus/
+F:	package/qoriq-rcw/
 F:	package/raptor/
-F:	package/rcw/
 F:	package/rng-tools/
 F:	package/rsyslog/
 F:	package/setools/
@ -1851,9 +1879,12 @@ N:	Michael Walle <michael@walle.cc>
 F:	board/kontron/smarc-sal28/
 F:	configs/kontron_smarc_sal28_defconfig
 F:	package/libavl/
+F:	package/rcw-smarc-sal28/

 N:	Michał Łyszczek <michal.lyszczek@bofc.pl>
 F:	board/altera/socrates_cyclone5/
+F:	board/pine64/rock64
+F:	configs/rock64_defconfig
 F:	configs/socrates_cyclone5_defconfig
 F:	package/netifrc/
 F:	package/openrc/
@ -1863,6 +1894,9 @@ N:	Michel Stempin <michel.stempin@wanadoo.fr>
 F:	board/licheepi/
 F:	configs/licheepi_zero_defconfig

+N:	Mike Frampton <mikeframpo@gmail.com>
+F:	package/qcom-db410c-firmware/
+
 N:	Mike Harmony <mike.harmony@snapav.com>
 F:	board/sinovoip/m2-plus/
 F:	configs/bananapi_m2_plus_defconfig
@ -1988,6 +2022,7 @@ N:	Pedro Aguilar <paguilar@paguilar.org>
 F:	package/libunistring/

 N:	Peter Korsgaard <peter@korsgaard.com>
+F:	board/arrow/avenger96/
 F:	board/beagleboneai/
 F:	board/minnowboard/
 F:	board/librecomputer/lafrite/
@ -1997,6 +2032,7 @@ F:	board/orangepi/
 F:	board/pandaboard/
 F:	board/roseapplepi/
 F:	boot/shim/
+F:	configs/avenger96_defconfig
 F:	configs/beagleboneai_defconfig
 F:	configs/lafrite_defconfig
 F:	configs/minnowboard_max-graphical_defconfig
@ -2165,10 +2201,6 @@ F:	package/gupnp-av/
 F:	package/let-me-create/
 F:	package/nanomsg/

-N:	Rahul Jain <rahul.jain@imgtec.com>
-F:	package/uhttpd/
-F:	package/ustream-ssl/
-
 N:	Ramon Fried <rfried.dev@gmail.com>
 F:	package/bitwise/

@ -2242,6 +2274,7 @@ F:	package/liblinear/
 F:	package/lensfun/
 F:	package/libclc/
 F:	package/libgta/
+F:	package/libiec61850/
 F:	package/libspatialindex/
 F:	package/linux-syscall-support/
 F:	package/llvm/
@ -2310,10 +2343,6 @@ F:	package/ripgrep/
 N:	Santosh Multhalli <santosh.multhalli@rockwellcollins.com>
 F:	package/valijson/

-N:	Scott Fan <fancp2007@gmail.com>
-F:	package/libssh/
-F:	package/x11r7/xdriver_xf86-video-fbturbo/
-
 N:	Sébastien Szymanski <sebastien.szymanski@armadeus.com>
 F:	package/mmc-utils/
 F:	package/python-flask-jsonrpc/
@ -2328,18 +2357,14 @@ F:	package/mpir/

 N:	Sergey Matyukevich <geomatsi@gmail.com>
 F:	boot/arm-trusted-firmware/
-F:	boot/binaries-marvell/
-F:	boot/mv-ddr-marvell/
 F:	board/linksprite/pcduino
 F:	board/orangepi/orangepi-zero
 F:	board/orangepi/orangepi-one
 F:	board/orangepi/orangepi-pc-plus/
-F:	board/solidrun/macchiatobin
 F:	configs/linksprite_pcduino_defconfig
 F:	configs/orangepi_one_defconfig
 F:	configs/orangepi_pc_plus_defconfig
 F:	configs/orangepi_zero_defconfig
-F:	configs/solidrun_macchiatobin_defconfig
 F:	package/armbian-firmware/
 F:	package/hostapd/
 F:	package/rtl8189fs/
@ -2498,15 +2523,23 @@ N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
 F:	package/cereal/
 F:	package/chartjs/
+F:	package/datatables/
+F:	package/datatables-buttons/
+F:	package/datatables-fixedcolumns/
+F:	package/datatables-responsive/
+F:	package/jszip/
 F:	package/libtelnet/
 F:	package/opkg-utils/
 F:	package/perl-convert-asn1/
 F:	package/perl-crypt-blowfish/
 F:	package/perl-crypt-cbc/
 F:	package/perl-crypt-openssl-aes/
+F:	package/perl-devel-cycle/
+F:	package/perl-devel-size/
 F:	package/perl-i18n/
 F:	package/perl-locale-maketext-lexicon/
 F:	package/perl-lwp-protocol-https/
+F:	package/perl-math-int64/
 F:	package/perl-math-prime-util/
 F:	package/perl-mime-base64-urlsafe/
 F:	package/perl-mojolicious-plugin-authentication/
@ -2520,6 +2553,7 @@ F:	package/perl-net-ssh2/
 F:	package/perl-net-telnet/
 F:	package/perl-path-class/
 F:	package/pigz/
+F:	package/popperjs/
 F:	package/xenomai/
 F:	support/scripts/size-stats
 F:	support/testing/tests/package/test_perl_lwp_protocol_https.py
@ -2528,6 +2562,8 @@ F:	toolchain/

 N:	Thomas Huth <huth@tuxfamily.org>
 F:	package/ascii-invaders/
+F:	package/frotz/
+F:	package/xorcurses/

 N:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 F:	arch/Config.in.arm
@ -2677,7 +2713,12 @@ N:	Wojciech Niziński <niziak@spox.org>
 F:	package/fwup/

 N:	Yair Ben Avraham <yairba@protonmail.com>
+F:	package/casync/
 F:	package/gloox/
+F:	package/tpm2-pkcs11/
+
+N:	Yann CARDAILLAC <ycardaillac@sepro-group.com>
+F:	package/open62541/

 N:	Yann E. MORIN <yann.morin.1998@free.fr>
 F:	board/friendlyarm/nanopi-neo/
--- a/buildroot/Makefile
+++ b/buildroot/Makefile
@ -92,9 +92,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2020.11.2
+export BR2_VERSION := 2021.02-rc3
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1612125000
+BR2_VERSION_EPOCH = 1614447000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@ -1223,7 +1223,7 @@ check-flake8:
 	| xargs file \
 	| grep 'Python script' \
 	| cut -d':' -f1 \
-	| xargs -- python3 -m flake8 --statistics --max-line-length=132
+	| xargs -- python3 -m flake8 --statistics

 check-package:
 	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \
--- a/buildroot/arch/Config.in.arc
+++ b/buildroot/arch/Config.in.arc
@ -39,9 +39,14 @@ config BR2_archs38_full

 config BR2_archs4x_rel31
 	bool "ARC HS48 rel 31"
+	help
+	   Build for HS48 release 3.1
+
+config BR2_archs4x
+	bool "ARC HS48"
 	help
 	   Latest release of HS48 processor
-	   - Dual- and quad multiply and MC oprations
+	   - Dual and Quad multiply and MAC operations
 	   - Double-precision FPU

 endchoice
@ -49,7 +54,9 @@ endchoice
 # Choice of atomic instructions presence
 config BR2_ARC_ATOMIC_EXT
 	bool "Atomic extension (LLOCK/SCOND instructions)"
-	default y if BR2_arc770d || BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full || BR2_archs4x_rel31
+	default y if BR2_arc770d
+	default y if BR2_archs38 || BR2_archs38_64mpy || BR2_archs38_full
+	default y if BR2_archs4x_rel31 || BR2_archs4x

 config BR2_ARCH
 	default "arc"	if BR2_arcle
@ -70,10 +77,12 @@ config BR2_GCC_TARGET_CPU
 	default "hs38"	 if BR2_archs38_64mpy
 	default "hs38_linux"	 if BR2_archs38_full
 	default "hs4x_rel31"	 if BR2_archs4x_rel31
+	default "hs4x"	 if BR2_archs4x

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

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

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

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

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

 endchoice

--- a/buildroot/arch/Config.in.powerpc
+++ b/buildroot/arch/Config.in.powerpc
@ -44,9 +44,6 @@ config BR2_powerpc_476fp
 config BR2_powerpc_505
 	bool "505"
 	depends on !BR2_ARCH_IS_64
-config BR2_powerpc_601
-	bool "601"
-	depends on !BR2_ARCH_IS_64
 config BR2_powerpc_602
 	bool "602"
 	depends on !BR2_ARCH_IS_64
@ -176,7 +173,6 @@ config BR2_GCC_TARGET_CPU
 	default "476"		if BR2_powerpc_476
 	default "476fp"		if BR2_powerpc_476fp
 	default "505"		if BR2_powerpc_505
-	default "601"		if BR2_powerpc_601
 	default "602"		if BR2_powerpc_602
 	default "603"		if BR2_powerpc_603
 	default "603e"		if BR2_powerpc_603e
--- a/buildroot/board/arm/foundation-v8/readme.txt
+++ b/buildroot/board/arm/foundation-v8/readme.txt
@ -3,17 +3,18 @@ ARM software simulator of the AArch64 architecture.

 First, one has to download the AArch64 software simulator from:

-  https://silver.arm.com/download/download.tm?pv=2663527
+  https://silver.arm.com/download/download.tm?pv=4807186

 Then, use the arm_foundationv8_defconfig configuration to build your
 Buildroot system.

 Finally, boot your system with:

- ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-4.7/Foundation_Platform \
+ ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \
    --image output/images/linux-system.axf \
    --block-device output/images/rootfs.ext2 \
-    --network=nat
+    --network=nat \
+    --cores 4

 You can get network access from within the simulated environment
 by requesting an IP address using DHCP (run the command 'udhcpc').
--- a/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf
+++ b/buildroot/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf
@ -0,0 +1,4 @@
+label stm32mp157c-dk2-buildroot
+  kernel /boot/zImage
+  devicetree /boot/stm32mp157a-dhcor-avenger96.dtb
+  append root=/dev/mmcblk1p4 rootwait
--- a/buildroot/board/arrow/avenger96/readme.txt
+++ b/buildroot/board/arrow/avenger96/readme.txt
@ -0,0 +1,41 @@
+Arrow Avenger96
+
+Intro
+=====
+
+This configuration supports the Arrow Avenger96 board:
+
+https://wiki.dh-electronics.com/index.php/Avenger96
+
+How to build
+============
+
+ $ make avenger96_defconfig
+ $ make
+
+How to write the microSD card
+=============================
+
+WARNING! This will destroy all the card content. Use with care!
+
+Once the build process is finished you will have an image called
+"sdcard.img" in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an microSD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+
+Boot the board
+==============
+
+ (1) Configure the boot switches for boot from microsd: 1-0-1
+
+ (2) Insert the microSD card in the slot
+
+ (3) Plug a serial adapter (beware: 1v8 levels!) to the low speed
+     expansion connector
+
+ (4) Plug in power cable
+
+ (5) The system will start, with the console on UART, but also visible
+     on the screen.
--- a/buildroot/board/atmel/readme.txt
+++ b/buildroot/board/atmel/readme.txt
@ -21,6 +21,8 @@ This guide covers the following configurations:
 - atmel_sama5d2_xplained_mmc_dev_defconfig
 - microchip_sama5d27_wlsom1_ek_mmc_defconfig
 - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig
+ - microchip_sam9x60ek_mmc_defconfig
+ - microchip_sam9x60ek_mmc_dev_defconfig

 These configurations will use AT91Bootstrap, u-boot and a linux kernel from
 the git trees maintained by Atmel.
--- a/buildroot/board/kontron/smarc-sal28/genimage.cfg
+++ b/buildroot/board/kontron/smarc-sal28/genimage.cfg
@ -3,6 +3,18 @@ image sdcard-emmc.img {
 		gpt = true
 	}

+	partition rcw {
+		offset = 4k
+		in-partition-table = "no"
+		image = "rcw.bin"
+	}
+
+	partition u-boot {
+		offset = 1M
+		in-partition-table = "no"
+		image = "u-boot.rom"
+	}
+
 	partition rootfs {
 		offset = 2M
 		image = rootfs.ext4
--- a/buildroot/board/kontron/smarc-sal28/readme.txt
+++ b/buildroot/board/kontron/smarc-sal28/readme.txt
@ -72,9 +72,17 @@ You will see something like this at boot time:
 [    4.569596] GPT:266272 != 7864319
 [    4.572925] GPT: Use GNU Parted to correct GPT errors.

-What does not work
-==================
+Updating the bootloader
+=======================

-For reasons unknown, the network card doesn't work if you use the original
-vendor bootloader. Board support patches for upstream u-boot are currently
-pending. Stay tuned.
+Buildroot will automatically build the u-boot bootloader. The resulting
+image is called u-boot.rom and you can find it in the images/ directory.
+
+To update the bootloader on the board you could either copy it to an
+USB thumb drive or you could put it on a TFTP server. The following
+example assumes you have the bootloader image copied to the root of
+a thumb drive:
+
+  # usb start
+  # load usb 0:1 $loadaddr u-boot.rom
+  # sf probe 0 && sf update $fileaddr 0x210000 $filesize
--- a/buildroot/board/microchip/sam9x60ek_mmc/genimage.cfg
+++ b/buildroot/board/microchip/sam9x60ek_mmc/genimage.cfg
@ -0,0 +1,31 @@
+# Image for SD card boot on Microchip SAM9X60-EK
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"at91-sam9x60ek.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
+	}
+}
--- a/buildroot/board/minnowboard/genimage.cfg
+++ b/buildroot/board/minnowboard/genimage.cfg
@ -19,15 +19,16 @@ image efi-part.vfat {
 #  * the efi-partition created above
 image sdcard.img {
 	hdimage {
+		gpt = true
 	}

 	partition boot {
-		partition-type = 0xEF
+		partition-type-uuid = U
 		image = "efi-part.vfat"
 	}

 	partition rootfs {
-		partition-type = 0x83
+		partition-type-uuid = L
 		image = "rootfs.ext4"
 		size = 512M
 	}
--- a/buildroot/board/minnowboard/grub.cfg
+++ b/buildroot/board/minnowboard/grub.cfg
@ -2,5 +2,5 @@ set default="0"
 set timeout="5"

 menuentry "Buildroot" {
-	linux /bzImage root=/dev/mmcblk2p2 rootwait console=tty0 console=ttyS0,115200
+	linux /bzImage root=PARTLABEL=rootfs rootwait console=tty0 console=ttyS0,115200 net.ifnames=0
 }
--- a/buildroot/board/minnowboard/linux.config
+++ b/buildroot/board/minnowboard/linux.config
@ -14,6 +14,7 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
+CONFIG_PCI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_ATA=y
--- a/buildroot/board/nexbox/a95x/boot.txt
+++ b/buildroot/board/nexbox/a95x/boot.txt
@ -1,4 +1,4 @@
-setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait
+setenv bootargs console=ttyAML0,115200 earlyprintk root=PARTUUID=feedc0de-02 rootwait

 fatload mmc 0:1 0x01080000 uImage

--- a/buildroot/board/nexbox/a95x/genimage.cfg
+++ b/buildroot/board/nexbox/a95x/genimage.cfg
@ -12,6 +12,8 @@ image boot.vfat {

 image sdcard.img {
 	hdimage {
+		# for root=PARTUUID support
+		disk-signature = 0xfeedc0de
 	}

 	partition boot {
--- a/buildroot/board/orangepi/orangepi-pc/linux.fragment
+++ b/buildroot/board/orangepi/orangepi-pc/linux.fragment
@ -1,4 +1,3 @@
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_REGULATOR_SY8106A=y
-CONFIG_DRM_SUN8I_DW_HDMI=y
 CONFIG_SUN8I_DE2_CCU=y
--- a/buildroot/board/orangepi/orangepi-r1/boot.cmd
+++ b/buildroot/board/orangepi/orangepi-r1/boot.cmd
@ -1,6 +1,6 @@
 setenv fdt_high ffffffff

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

 fatload mmc 0 $kernel_addr_r zImage
 fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-r1.dtb
--- a/buildroot/board/orangepi/orangepi-r1/genimage.cfg
+++ b/buildroot/board/orangepi/orangepi-r1/genimage.cfg
@ -13,13 +13,17 @@ image boot.vfat {

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

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

 	partition boot {
@ -28,6 +32,8 @@ 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"
--- a/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd
+++ b/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd
@ -1,4 +1,4 @@
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait

 fatload mmc 0 $kernel_addr_r Image
 fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb
--- a/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg
+++ b/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg
@ -11,6 +11,10 @@ image boot.vfat {

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

 	partition spl {
@ -23,7 +27,7 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40K
+		size = 1024000 # 1MB - 40K + 16K(GPT)
 	}

 	partition boot {
@ -32,8 +36,11 @@ 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"
+		size = 256M
 	}
 }
--- a/buildroot/board/pine64/rock64/extlinux.conf
+++ b/buildroot/board/pine64/rock64/extlinux.conf
@ -0,0 +1,4 @@
+label rock64-buildroot
+  kernel /boot/Image
+  devicetree /boot/rk3328-rock64.dtb
+  append console=ttyS2,1500000n8 root=/dev/mmcblk0p1 ro rootwait
--- a/buildroot/board/pine64/rock64/genimage.cfg
+++ b/buildroot/board/pine64/rock64/genimage.cfg
@ -0,0 +1,23 @@
+image sdcard.img {
+    hdimage {
+    }
+
+    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 = 262144 # 512 * 0x200 from start of sd card
+    }
+
+    partition rootfs {
+        partition-type = 0x83
+        bootable = "yes"
+        image = "rootfs.ext2"
+        size = 500M
+    }
+}
--- a/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
+++ b/buildroot/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
@ -0,0 +1,32 @@
+From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
+Date: Tue, 5 Feb 2019 22:08:54 +0100
+Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 8086f3c93e..a6425b5b03 100644
+--- a/Makefile
+++ b/Makefile
+@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),)
+ ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
+ endif
+ 
+# rk3328 needs itb image to boot properly
+ifeq ($(CONFIG_ROCKCHIP_RK3328),y)
+ALL-y += u-boot.itb
+endif
+
+ # enable combined SPL/u-boot/dtb rules for tegra
+ ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
+ ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
+-- 
+2.18.1
+
--- a/buildroot/board/pine64/rock64/post-build.sh
+++ b/buildroot/board/pine64/rock64/post-build.sh
@ -0,0 +1,9 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOARD_DIR="$(dirname $0)"
+
+$MKIMAGE -n rk3328 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img
+cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl.bin > $BINARIES_DIR/u-boot-tpl-spl.img
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
--- a/buildroot/board/pine64/rock64/readme.txt
+++ b/buildroot/board/pine64/rock64/readme.txt
@ -0,0 +1,95 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Rock64. With this default configuration you
+can log in into board via uart and look around.
+
+Board homepage: https://www.pine64.org/?page_id=7147
+
+Build
+=====
+
+First, load rock64 config for buildroot
+
+  $ make rock64_defconfig
+
+Optionally make changes to buildroot config (to install more programs)
+
+  $ make menuconfig
+
+And then build everything
+
+  $ make
+
+When completed, following files will be generated in output/images directory:
+
+  .
+  ├── Image
+  ├── bl31.bin
+  ├── bl31.elf
+  ├── rk3328-rock64.dtb
+  ├── rootfs.ext2
+  ├── rootfs.ext4 -> rootfs.ext2
+  ├── rootfs.tar
+  ├── sdcard.img
+  ├── u-boot-spl.bin
+  ├── u-boot-tpl-spl.img
+  ├── u-boot-tpl.bin
+  ├── u-boot-tpl.img
+  ├── u-boot.bin
+  └── u-boot.itb
+
+Creating bootable SD card
+=========================
+
+!!! THIS COMMAND MAY WIPE YOUR DISK!
+!!! MAKE SURE YOU PASSED CORRECT DEVICE!
+!!! OR IT THIS WILL WIPE YOUR DISK!
+
+Simply invoke (as root)
+
+  # dd if=output/images/sdcard.img of=/dev/sdX && sync
+
+Where X is your SD card device (not partition), of= argument may also be
+/dev/mmcblk0 if you are using built-in sd card reader.
+
+Runtime
+=======
+
+Login
+-----
+
+By default, buildroot has no password, just type 'root' as login user, and
+you will be logged in.
+
+Serial console
+--------------
+
+Serial console needs to be connected to pins (into 40pin rpi compatible part)
+
+pin 6:  gnd
+pin 8:  tx
+pin 10: rx
+
+Pin numbers are printed on board.
+
+Uart configuration is not standard. Rock64 uses 1500000 (1,5M) baudrate
+with standard 8n1.
+
+Ethernet
+--------
+
+To enable ethernet you need to load modules for it:
+
+# modprobe stmmac
+# modprobe dwmac-rk
+
+and since by default there is no dhcp installed, you need to configure ip
+address, remember to change address to fit your network.
+
+# ifconfig eth0 up
+# ip addr add 10.1.1.180/24 dev eth0
+# ping 10.1.1.1
+PING 10.1.1.1 (10.1.1.1): 56 data bytes
+64 bytes from 10.1.1.1: seq=0 ttl=64 time=0.695 ms
--- a/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
+++ b/buildroot/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch
@ -1,4 +1,4 @@
-From 4ac4324dcdaf237aa34545b3795acb2e5c42d10e Mon Sep 17 00:00:00 2001
+From 525dd2f3cf4a94837ce6b71d793acb90c25a5654 Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Fri, 1 Feb 2019 11:36:20 +0100
 Subject: [PATCH] arm-versatile-nommu: Linux patch
@ -21,10 +21,10 @@ Signed-off-by: Romain Naour <romain.naour@smile.fr>
 create mode 100644 arch/arm/mach-versatile/Makefile.boot

 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e8cd55a5b04c..fc2dbff70394 100644
+index 002e0cf025f5..c71299b6f91f 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -353,6 +353,17 @@ config ARM_SINGLE_ARMV7M
+@@ -343,6 +343,17 @@ config ARM_SINGLE_ARMV7M
 	select SPARSE_IRQ
 	select USE_OF
 
@ -43,10 +43,10 @@ index e8cd55a5b04c..fc2dbff70394 100644
 	bool "EBSA-110"
 	select ARCH_USES_GETTIMEOFFSET
 diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
-index f6fcb8a79889..92fc637d3db8 100644
+index 8986a91a6f31..69cb6404e8ce 100644
 --- a/arch/arm/Kconfig.debug
 +++ b/arch/arm/Kconfig.debug
-@@ -1843,7 +1843,8 @@ config DEBUG_UNCOMPRESS
+@@ -1943,7 +1943,8 @@ config DEBUG_UNCOMPRESS
 config UNCOMPRESS_INCLUDE
 	string
 	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
@ -57,10 +57,10 @@ index f6fcb8a79889..92fc637d3db8 100644
 
 config EARLY_PRINTK
 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
-index 9b7c328fb207..b1fe9c8b5c3e 100644
+index 92282558caf7..90bd9c069ffc 100644
 --- a/arch/arm/include/asm/mach/map.h
 +++ b/arch/arm/include/asm/mach/map.h
-@@ -62,6 +62,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
+@@ -59,6 +59,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
 #else
 #define iotable_init(map,num)	do { } while (0)
 #define vm_reserve_area_early(a,s,c)	do { } while (0)
@ -69,7 +69,7 @@ index 9b7c328fb207..b1fe9c8b5c3e 100644
 
 #endif
 diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
-index f5c275434d6c..06ad999d5978 100644
+index d88e7725bf99..d38b90157f13 100644
 --- a/arch/arm/mach-versatile/Kconfig
 +++ b/arch/arm/mach-versatile/Kconfig
@@ -1,7 +1,8 @@
@ -93,10 +93,10 @@ index 000000000000..eacfc3f5c33e
 +# Patch waits for application at
 +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
 diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
-index 3c8d39c12909..8cfa05a37295 100644
+index 02ba68abe533..835b51bc597b 100644
 --- a/arch/arm/mach-versatile/versatile_dt.c
 +++ b/arch/arm/mach-versatile/versatile_dt.c
-@@ -37,7 +37,11 @@
+@@ -22,7 +22,11 @@
 #include <asm/mach/map.h>
 
 /* macro to get at MMIO space when running virtually */
@ -109,5 +109,5 @@ index 3c8d39c12909..8cfa05a37295 100644
 
 /*
 -- 
-2.14.5
+2.17.1

--- a/buildroot/board/qemu/arm-vexpress-tz/readme.txt
+++ b/buildroot/board/qemu/arm-vexpress-tz/readme.txt
@ -18,7 +18,7 @@ secure and non-secure worlds.
 	-serial stdio \
 	-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic \
 	-semihosting-config enable,target=native \
-	-bios bl1.bin
+	-bios bl1.bin # qemu_arm_vexpress_tz_defconfig

 The boot stage traces (if any) followed by the login prompt will appear
 in the terminal that started QEMU.
--- a/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
+++ b/buildroot/board/qemu/mips32r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
@ -1,4 +1,4 @@
-From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001
+From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Sat, 25 Jul 2020 11:46:01 +0200
 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6
@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
 1 file changed, 45 insertions(+)

 diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
-index 0ae9b4cbc153..ea600e0ebfe7 100644
+index 2203e2d0ae2a..e28096faecf6 100644
 --- a/arch/mips/include/asm/vdso/gettimeofday.h
 +++ b/arch/mips/include/asm/vdso/gettimeofday.h
-@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback(
+@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback(
 	register long nr asm("v0") = __NR_gettimeofday;
 	register long error asm("a3");
 
@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback(
+@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback(
 #endif
 	register long error asm("a3");
 
@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback(
+@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback(
 #endif
 	register long error asm("a3");
 
@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback(
+@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback(
 	register long nr asm("v0") = __NR_clock_gettime;
 	register long error asm("a3");
 
@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback(
+@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback(
 	register long nr asm("v0") = __NR_clock_getres;
 	register long error asm("a3");
 
@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 	return error ? -ret : ret;
 }
 -- 
-2.25.4
+2.17.1

--- a/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
+++ b/buildroot/board/qemu/mips32r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
@ -1,4 +1,4 @@
-From bb04c220d82598066eeadf49defaec1157d4d206 Mon Sep 17 00:00:00 2001
+From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Sat, 25 Jul 2020 11:46:01 +0200
 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6
@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
 1 file changed, 45 insertions(+)

 diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
-index 0ae9b4cbc153..ea600e0ebfe7 100644
+index 2203e2d0ae2a..e28096faecf6 100644
 --- a/arch/mips/include/asm/vdso/gettimeofday.h
 +++ b/arch/mips/include/asm/vdso/gettimeofday.h
-@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback(
+@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback(
 	register long nr asm("v0") = __NR_gettimeofday;
 	register long error asm("a3");
 
@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback(
+@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback(
 #endif
 	register long error asm("a3");
 
@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback(
+@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback(
 #endif
 	register long error asm("a3");
 
@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback(
+@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback(
 	register long nr asm("v0") = __NR_clock_gettime;
 	register long error asm("a3");
 
@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback(
+@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback(
 	register long nr asm("v0") = __NR_clock_getres;
 	register long error asm("a3");
 
@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 	return error ? -ret : ret;
 }
 -- 
-2.25.4
+2.17.1

--- a/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
+++ b/buildroot/board/qemu/mips64r6-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
@ -1,4 +1,4 @@
-From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001
+From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Sat, 25 Jul 2020 11:46:01 +0200
 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6
@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
 1 file changed, 45 insertions(+)

 diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
-index 0ae9b4cbc153..ea600e0ebfe7 100644
+index 2203e2d0ae2a..e28096faecf6 100644
 --- a/arch/mips/include/asm/vdso/gettimeofday.h
 +++ b/arch/mips/include/asm/vdso/gettimeofday.h
-@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback(
+@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback(
 	register long nr asm("v0") = __NR_gettimeofday;
 	register long error asm("a3");
 
@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback(
+@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback(
 #endif
 	register long error asm("a3");
 
@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback(
+@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback(
 #endif
 	register long error asm("a3");
 
@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback(
+@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback(
 	register long nr asm("v0") = __NR_clock_gettime;
 	register long error asm("a3");
 
@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback(
+@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback(
 	register long nr asm("v0") = __NR_clock_getres;
 	register long error asm("a3");
 
@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 	return error ? -ret : ret;
 }
 -- 
-2.25.4
+2.17.1

--- a/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
+++ b/buildroot/board/qemu/mips64r6el-malta/patches/linux/0001-mips-Do-not-include-hi-and-lo-in-clobber-list-for-R6.patch
@ -1,4 +1,4 @@
-From cfb381d8f4b64f3752c95b4bdd787be63ef84fb2 Mon Sep 17 00:00:00 2001
+From b9af6f34e43bf5264d75933f2080f16b8741048d Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Sat, 25 Jul 2020 11:46:01 +0200
 Subject: [PATCH] mips: Do not include hi and lo in clobber list for R6
@ -31,10 +31,10 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
 1 file changed, 45 insertions(+)

 diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
-index 0ae9b4cbc153..ea600e0ebfe7 100644
+index 2203e2d0ae2a..e28096faecf6 100644
 --- a/arch/mips/include/asm/vdso/gettimeofday.h
 +++ b/arch/mips/include/asm/vdso/gettimeofday.h
-@@ -36,12 +36,21 @@ static __always_inline long gettimeofday_fallback(
+@@ -30,12 +30,21 @@ static __always_inline long gettimeofday_fallback(
 	register long nr asm("v0") = __NR_gettimeofday;
 	register long error asm("a3");
 
@ -56,7 +56,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -60,12 +69,21 @@ static __always_inline long clock_gettime_fallback(
+@@ -54,12 +63,21 @@ static __always_inline long clock_gettime_fallback(
 #endif
 	register long error asm("a3");
 
@ -78,7 +78,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -84,12 +102,21 @@ static __always_inline int clock_getres_fallback(
+@@ -78,12 +96,21 @@ static __always_inline int clock_getres_fallback(
 #endif
 	register long error asm("a3");
 
@ -100,7 +100,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -108,12 +135,21 @@ static __always_inline long clock_gettime32_fallback(
+@@ -100,12 +127,21 @@ static __always_inline long clock_gettime32_fallback(
 	register long nr asm("v0") = __NR_clock_gettime;
 	register long error asm("a3");
 
@ -122,7 +122,7 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 
 	return error ? -ret : ret;
 }
-@@ -128,12 +164,21 @@ static __always_inline int clock_getres32_fallback(
+@@ -120,12 +156,21 @@ static __always_inline int clock_getres32_fallback(
 	register long nr asm("v0") = __NR_clock_getres;
 	register long error asm("a3");
 
@ -145,5 +145,5 @@ index 0ae9b4cbc153..ea600e0ebfe7 100644
 	return error ? -ret : ret;
 }
 -- 
-2.25.4
+2.17.1

--- a/buildroot/board/qemu/post-image.sh
+++ b/buildroot/board/qemu/post-image.sh
@ -19,14 +19,17 @@ if [ -z "${QEMU_CMD_LINE}" ]; then
    exit 0
 fi

-# Replace output/images path by ${IMAGE_DIR} since the script
-# will be in the same directory as the kernel and the rootfs images.
-QEMU_CMD_LINE="${QEMU_CMD_LINE//output\/images/\${IMAGE_DIR\}}"
+# Remove output/images path since the script will be in
+# the same directory as the kernel and the rootfs images.
+QEMU_CMD_LINE="${QEMU_CMD_LINE//output\/images\//}"

 # Remove -serial stdio if present, keep it as default args
 DEFAULT_ARGS="$(sed -r -e '/-serial stdio/!d; s/.*(-serial stdio).*/\1/' <<<"${QEMU_CMD_LINE}")"
 QEMU_CMD_LINE="${QEMU_CMD_LINE//-serial stdio/}"

+# Remove any string before qemu-system-*
+QEMU_CMD_LINE="$(sed -r -e 's/^.*(qemu-system-)/\1/' <<<"${QEMU_CMD_LINE}")"
+
 # Disable graphical output and redirect serial I/Os to console
 case ${DEFCONFIG_NAME} in
  (qemu_sh4eb_r2d_defconfig|qemu_sh4_r2d_defconfig)
@ -40,7 +43,9 @@ esac

 cat <<-_EOF_ > "${START_QEMU_SCRIPT}"
 	#!/bin/sh
-	IMAGE_DIR="\${0%/*}/"
+	(
+	BINARIES_DIR="\${0%/*}/"
+	cd \${BINARIES_DIR}

 	if [ "\${1}" = "serial-only" ]; then
 	    EXTRA_ARGS='${SERIAL_ARGS}'
@ -50,6 +55,7 @@ cat <<-_EOF_ > "${START_QEMU_SCRIPT}"

 	export PATH="${HOST_DIR}/bin:\${PATH}"
 	exec ${QEMU_CMD_LINE} \${EXTRA_ARGS}
+	)
 _EOF_

 chmod +x "${START_QEMU_SCRIPT}"
--- a/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch
+++ b/buildroot/board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch
@ -1,4 +1,4 @@
-From 44e3424424b447b00fbe1f10ddba81b55817e970 Mon Sep 17 00:00:00 2001
+From a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben@decadent.org.uk>
 Date: Wed, 26 Dec 2018 00:00:40 +0000
 Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler
@ -20,7 +20,7 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index 37ac731a556b..5211ea4f48b1 100644
+index 5c8c06215dd4..e3dbea6d7ae0 100644
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
@@ -12,7 +12,7 @@
@ -32,7 +32,7 @@ index 37ac731a556b..5211ea4f48b1 100644
 
 # Set default 32 bits cross compilers for vdso and boot wrapper
 CROSS32_COMPILE ?=
-@@ -166,6 +166,7 @@ CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option, $(MULTIPLEWORD))
+@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option, $(MULTIPLEWORD))
 
 CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option,-mno-readonly-in-sdata)
 
@ -40,7 +40,7 @@ index 37ac731a556b..5211ea4f48b1 100644
 ifdef CONFIG_PPC_BOOK3S_64
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
-@@ -177,6 +178,7 @@ endif
+@@ -175,6 +176,7 @@ endif
 else
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
 endif
@ -49,5 +49,5 @@ index 37ac731a556b..5211ea4f48b1 100644
 ifdef CONFIG_FUNCTION_TRACER
 CC_FLAGS_FTRACE := -pg
 -- 
-2.25.4
+2.17.1

--- a/buildroot/board/qemu/ppc-virtex-ml507/linux.config
+++ b/buildroot/board/qemu/ppc-virtex-ml507/linux.config
@ -1,36 +0,0 @@
-CONFIG_44x=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_EBONY is not set
-CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
-CONFIG_MATH_EMULATION=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_XILINX_SYSACE=y
-CONFIG_NETDEVICES=y
-CONFIG_SERIO_XILINX_XPS_PS2=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_UARTLITE=y
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_XILINX_HWICAP=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_XILINX=y
-CONFIG_FB=y
-CONFIG_FB_XILINX=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_EXT4_FS=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
--- a/buildroot/board/qemu/ppc-virtex-ml507/readme.txt
+++ b/buildroot/board/qemu/ppc-virtex-ml507/readme.txt
@ -1,5 +0,0 @@
-Run the emulation with:
-
- qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb # qemu_ppc_virtex_ml507_defconfig
-
-The login prompt will appear in the terminal that started Qemu.
--- a/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch
+++ b/buildroot/board/qemu/sh4-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch
@ -1,32 +0,0 @@
-From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 21 Dec 2019 11:52:04 +0100
-Subject: [PATCH] arch/sh: vmlinux.scr
-
-Building the kernel using a toolchain built with Binutils 2.33.1 prevent
-booting a sh4 system under Qemu.
-Apply the patch provided by Alan Modra [2] that fix alignment of rodata.
-
-[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
-[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- arch/sh/boot/compressed/vmlinux.scr | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr
-index 862d74808236..dd292b4b9082 100644
--- a/arch/sh/boot/compressed/vmlinux.scr
-+++ b/arch/sh/boot/compressed/vmlinux.scr
-@@ -1,6 +1,6 @@
- SECTIONS
- {
-  .rodata..compressed : {
-+  .rodata..compressed : ALIGN(8) {
- 	input_len = .;
- 	LONG(input_data_end - input_data) input_data = .;
- 	*(.data)
-- 
-2.24.1
-
--- a/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch
+++ b/buildroot/board/qemu/sh4-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch
@ -1,32 +0,0 @@
-From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 21 Dec 2019 11:54:07 +0100
-Subject: [PATCH] include/asm-generic: vmlinux.lds.h
-
-Building the kernel using a toolchain built with Binutils 2.33.1 prevent
-booting a sh4 system under Qemu.
-Apply the patch provided by Alan Modra [2] that fix alignment of rodata.
-
-[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
-[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- include/asm-generic/vmlinux.lds.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index d7701d466b60..1aa33597e91e 100644
--- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -306,6 +306,7 @@
-  */
- #ifndef RO_AFTER_INIT_DATA
- #define RO_AFTER_INIT_DATA						\
-+	. = ALIGN(8);							\
- 	__start_ro_after_init = .;					\
- 	*(.data..ro_after_init)						\
- 	__end_ro_after_init = .;
-- 
-2.24.1
-
--- a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch
+++ b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0001-arch-sh-vmlinux.scr.patch
@ -1,32 +0,0 @@
-From fe657afd48fc67841d32207ef9eeeb5f099764cd Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 21 Dec 2019 11:52:04 +0100
-Subject: [PATCH] arch/sh: vmlinux.scr
-
-Building the kernel using a toolchain built with Binutils 2.33.1 prevent
-booting a sh4 system under Qemu.
-Apply the patch provided by Alan Modra [2] that fix alignment of rodata.
-
-[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ebd2263ba9a9124d93bbc0ece63d7e0fae89b40e
-[2] https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- arch/sh/boot/compressed/vmlinux.scr | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr
-index 862d74808236..dd292b4b9082 100644
--- a/arch/sh/boot/compressed/vmlinux.scr
-+++ b/arch/sh/boot/compressed/vmlinux.scr
-@@ -1,6 +1,6 @@
- SECTIONS
- {
-  .rodata..compressed : {
-+  .rodata..compressed : ALIGN(8) {
- 	input_len = .;
- 	LONG(input_data_end - input_data) input_data = .;
- 	*(.data)
-- 
-2.24.1
-
--- a/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch
+++ b/buildroot/board/qemu/sh4eb-r2d/patches/linux/0002-include-asm-generic-vmlinux.lds.h.patch
@ -1,27 +0,0 @@
-From 7f92adbba385a4e512abfd6633ac0f9f0cdf91f8 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 21 Dec 2019 11:54:07 +0100
-Subject: [PATCH] include/asm-generic: vmlinux.lds.h
-
-https://www.sourceware.org/ml/binutils/2019-12/msg00112.html
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- include/asm-generic/vmlinux.lds.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index d7701d466b60..1aa33597e91e 100644
--- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -306,6 +306,7 @@
-  */
- #ifndef RO_AFTER_INIT_DATA
- #define RO_AFTER_INIT_DATA						\
-+	. = ALIGN(8);							\
- 	__start_ro_after_init = .;					\
- 	*(.data..ro_after_init)						\
- 	__end_ro_after_init = .;
-- 
-2.24.1
-
--- a/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch
+++ b/buildroot/board/roseapplepi/patches/linux/0001-arm-dts-owl-s500-Fix-incorrect-PPI.patch
@ -1,52 +0,0 @@
-From:   Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
-Subject: [PATCH 1/4] arm: dts: owl-s500: Fix incorrect PPI interrupt specifiers
-To:     Rob Herring <robh+dt@kernel.org>,
-        Andreas Färber <afaerber@suse.de>,
-        Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Cc:     devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
-        linux-kernel@vger.kernel.org
-Date: Mon, 15 Jun 2020 03:19:08 +0300 (10 weeks, 3 days, 20 hours ago)
-X-Mailer: git-send-email 2.27.0
-
-The PPI interrupts for cortex-a9 were incorrectly specified, fix them.
-
-Fixes: fdfe7f4f9d85 ("ARM: dts: Add Actions Semi S500 and LeMaker Guitar")
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- arch/arm/boot/dts/owl-s500.dtsi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi
-index 5ceb6cc4451d..1dbe4e8b38ac 100644
--- a/arch/arm/boot/dts/owl-s500.dtsi
-+++ b/arch/arm/boot/dts/owl-s500.dtsi
-@@ -84,21 +84,21 @@ scu: scu@b0020000 {
- 		global_timer: timer@b0020200 {
- 			compatible = "arm,cortex-a9-global-timer";
- 			reg = <0xb0020200 0x100>;
-			interrupts = <GIC_PPI 0 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
-+			interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
- 			status = "disabled";
- 		};
- 
- 		twd_timer: timer@b0020600 {
- 			compatible = "arm,cortex-a9-twd-timer";
- 			reg = <0xb0020600 0x20>;
-			interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
-+			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
- 			status = "disabled";
- 		};
- 
- 		twd_wdt: wdt@b0020620 {
- 			compatible = "arm,cortex-a9-twd-wdt";
- 			reg = <0xb0020620 0xe0>;
-			interrupts = <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
-+			interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
- 			status = "disabled";
- 		};
- 
-- 
-2.27.0
-
-
--- a/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch
+++ b/buildroot/board/roseapplepi/patches/linux/0002-arm-dts-owl-s500-add-RoseapplePi.patch
@ -1,89 +0,0 @@
-From:   Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
-Subject: [PATCH 4/4] arm: dts: owl-s500: Add RoseapplePi
-To:     Rob Herring <robh+dt@kernel.org>,
-        Andreas Färber <afaerber@suse.de>,
-        Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Cc:     devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
-        linux-arm-kernel@lists.infradead.org
-Date: Mon, 15 Jun 2020 03:19:11 +0300 (10 weeks, 3 days, 20 hours ago)
-X-Mailer: git-send-email 2.27.0
-
-Add a Device Tree for the RoseapplePi SBC.
-
-Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- arch/arm/boot/dts/Makefile                 |  1 +
- arch/arm/boot/dts/owl-s500-roseapplepi.dts | 47 ++++++++++++++++++++++
- 2 files changed, 48 insertions(+)
- create mode 100644 arch/arm/boot/dts/owl-s500-roseapplepi.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index e8dd99201397..d0712e7275da 100644
--- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -856,6 +856,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
- dtb-$(CONFIG_ARCH_ACTIONS) += \
- 	owl-s500-cubieboard6.dtb \
- 	owl-s500-guitar-bb-rev-b.dtb \
-+	owl-s500-roseapplepi.dtb \
- 	owl-s500-sparky.dtb
- dtb-$(CONFIG_ARCH_PRIMA2) += \
- 	prima2-evb.dtb
-diff --git a/arch/arm/boot/dts/owl-s500-roseapplepi.dts b/arch/arm/boot/dts/owl-s500-roseapplepi.dts
-new file mode 100644
-index 000000000000..c61fbaa3821e
--- /dev/null
-+++ b/arch/arm/boot/dts/owl-s500-roseapplepi.dts
-@@ -0,0 +1,47 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Roseapple Pi
-+ *
-+ * Copyright (c) 2020 Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
-+ */
-+
-+/dts-v1/;
-+
-+#include "owl-s500.dtsi"
-+
-+/ {
-+	compatible = "roseapplepi,roseapplepi", "actions,s500";
-+	model = "Roseapple Pi";
-+
-+	aliases {
-+		serial2 = &uart2;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial2:115200n8";
-+	};
-+
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0x0 0x80000000>; /* 2GB */
-+	};
-+
-+	uart2_clk: uart2-clk {
-+		compatible = "fixed-clock";
-+		clock-frequency = <921600>;
-+		#clock-cells = <0>;
-+	};
-+};
-+
-+&twd_timer {
-+	status = "okay";
-+};
-+
-+&timer {
-+	clocks = <&hosc>;
-+};
-+
-+&uart2 {
-+	status = "okay";
-+	clocks = <&uart2_clk>;
-+};
-- 
-2.27.0
-
-
--- a/buildroot/board/sifive/hifive-unleashed/boot.cmd
+++ b/buildroot/board/sifive/hifive-unleashed/boot.cmd
@ -0,0 +1,4 @@
+setenv bootargs earlycon=sbi root=/dev/mmcblk0p3 rootwait
+load mmc 0:3 ${kernel_addr_r} boot/Image
+load mmc 0:3 ${fdt_addr_r} boot/hifive-unleashed-a00.dtb
+booti ${kernel_addr_r} - ${fdt_addr_r}
--- a/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg
+++ b/buildroot/board/sifive/hifive-unleashed/genimage_sdcard.cfg
@ -3,15 +3,21 @@ image sdcard.img {
 		gpt = true
 	}

-	partition bootloader {
-		image = "fw_payload.bin"
-		offset = 1M
-		size = 32M
+	partition u-boot-spl {
+		image = "u-boot-spl.bin"
+		offset = 17K
+		partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47
+	}
+
+	partition u-boot {
+		image = "u-boot.itb"
+		offset = 1041K
 		partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985
 	}

 	partition rootfs {
 		image = "rootfs.ext4"
 		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
+		bootable = true
 	}
 }
--- a/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg
+++ b/buildroot/board/sifive/hifive-unleashed/genimage_spi-nor.cfg
@ -0,0 +1,19 @@
+image spi-nor.img {
+	size = 32M
+
+	hdimage {
+		gpt = true
+	}
+
+	partition u-boot-spl {
+		image = "u-boot-spl.bin"
+		offset = 20K
+		partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47
+	}
+
+	partition u-boot {
+		image = "u-boot.itb"
+		offset = 1044K
+		partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985
+	}
+}
--- a/buildroot/board/sifive/hifive-unleashed/linux.config.fragment
+++ b/buildroot/board/sifive/hifive-unleashed/linux.config.fragment
@ -1,16 +1,10 @@
 CONFIG_HZ_100=y
-CONFIG_CMDLINE="earlycon=sbi root=/dev/mmcblk0p2 rootwait"
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_SERIAL_SIFIVE=y
-CONFIG_SERIAL_SIFIVE_CONSOLE=y
-CONFIG_SPI=y
-CONFIG_SPI_SIFIVE=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_SIFIVE=y
-CONFIG_MMC=y
-CONFIG_MMC_SPI=y
-CONFIG_CLK_U54_PRCI=y
-CONFIG_CLK_GEMGXL_MGMT=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_SPI_NOR=y
 CONFIG_PWM=y
 CONFIG_PWM_SIFIVE=y
--- a/buildroot/board/sifive/hifive-unleashed/post-build.sh
+++ b/buildroot/board/sifive/hifive-unleashed/post-build.sh
@ -0,0 +1,2 @@
+#!/bin/sh
+cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
--- a/buildroot/board/sifive/hifive-unleashed/readme.txt
+++ b/buildroot/board/sifive/hifive-unleashed/readme.txt
@ -28,30 +28,41 @@ Result of the build
 Once the build has finished you will have the following files:

    output/images/
+    +-- boot.scr
+    +-- fw_dynamic.bin
+    +-- fw_dynamic.elf
    +-- fw_jump.bin
    +-- fw_jump.elf
-    +-- fw_payload.bin
-    +-- fw_payload.elf
+    +-- hifive-unleashed-a00.dtb
    +-- Image
+    +-- rootfs.cpio
    +-- rootfs.ext2
    +-- rootfs.ext4
    +-- rootfs.tar
    +-- sdcard.img
+    +-- u-boot.bin
+    +-- u-boot.itb
+    +-- u-boot-spl.bin


 Creating a bootable SD card with genimage
 =========================================

-Buildroot builds a SD card image for you. All you need to do is dd the
-image to your SD card, which can be done with the following command:
+By default Buildroot builds a SD card image for you. All you need to do
+is dd the image to your SD card, which can be done with the following
+command on your development host:

-  $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=4096
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdb bs=4096
+
+The above example command assumes the SD card is accessed via a USB card
+reader and shows up as /dev/sdb on the host. Adjust it accordingly per
+your actual setup.

 Booting the SD card on the board
 ================================

 Make sure that the all DIP switches are set to the off position for
-default boot mode (MSEL mode = 1111), insert the SD card and power
+default boot mode (MSEL mode = 1011), insert the SD card and power
 up the board.

 Connect the USB cable and open minicom (/dev/ttyUSB1, 115200, 8N1).
@ -60,16 +71,45 @@ See the 'SiFive HiFive Unleashed Getting Started Guide' for
 more details (https://www.sifive.com/documentation).

 You will get a warning reported by fdisk when you examine the SD card.
-This is because the genimage.cfg file doesn't specify the SD card size
-(as people will naturally have different sized cards), so the
+This is because the genimage_sdcard.cfg file doesn't specify the SD card
+size (as people will naturally have different sized cards), so the
 secondary GPT header is placed after the rootfs rather than at the end
 of the disk where it is expected to be.

 You will see something like this at boot time:

-[    2.318722] GPT:Primary header thinks Alt. header is not at the end of the disk.
-[    2.325390] GPT:190496 != 122142719
-[    2.328843] GPT:Alternate GPT header not at the end of the disk.
-[    2.334824] GPT:190496 != 122142719
-[    2.338302] GPT: Use GNU Parted to correct GPT errors.
-[    2.343456]  mmcblk0: p1 p2
+[    0.989458] mmc0: host does not support reading read-only switch, assuming write-enable
+[    0.996772] mmc0: new SDHC card on SPI
+[    1.001634] mmcblk0: mmc0:0000 SD8GB 7.28 GiB
+[    1.038079] GPT:Primary header thinks Alt. header is not at the end of the disk.
+[    1.044759] GPT:52389 != 15264767
+[    1.048051] GPT:Alternate GPT header not at the end of the disk.
+[    1.054015] GPT:52389 != 15264767
+[    1.057323] GPT: Use GNU Parted to correct GPT errors.
+[    1.062479]  mmcblk0: p1 p2 p3
+
+
+Creating a bootable SPI flash with genimage
+===========================================
+
+Adjust Buildroot configuration by:
+
+  $ make menuconfig
+
+Change "System configuration" -> "Extra arguments passed to custom scripts"
+value to "-c board/sifive/hifive-unleashed/genimage_spi-nor.cfg", save the
+configuration and build. This creates a output/images/spi-nor.img that can
+be programmed to the on-board SPI flash.
+
+Boot the board from the SD card prepared above, stop the U-Boot auto boot,
+and type the following commands to program the whole SPI flash:
+
+  => tftp 82000000 output/images/spi-nor.img
+  => sf probe
+  => sf update 82000000 0 2000000
+
+Booting the SPI flash on the board
+==================================
+
+Make sure that the all DIP switches are set to the off position for
+default boot mode (MSEL mode = 0110) to boot from SPI flash.
--- a/buildroot/board/sinovoip/m1-plus/boot.cmd
+++ b/buildroot/board/sinovoip/m1-plus/boot.cmd
@ -0,0 +1,5 @@
+setenv fdt_high ffffffff
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi-m1-plus.dtb
+bootz $kernel_addr_r - $fdt_addr_r
--- a/buildroot/board/sinovoip/m1-plus/genimage.cfg
+++ b/buildroot/board/sinovoip/m1-plus/genimage.cfg
@ -0,0 +1,37 @@
+# Minimal SD card image for the Banana Pi M1+
+# Based on the Banana Pro genimage.cfg
+
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun7i-a20-bananapi-m1-plus.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
--- a/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment
+++ b/buildroot/board/sinovoip/m1-plus/linux-wifi.fragment
@ -0,0 +1,10 @@
+# Networking support
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_RFKILL=y
+
+# Network device support
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_BRCMFMAC=m
--- a/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch
+++ b/buildroot/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch
@ -0,0 +1,39 @@
+From 58bae4096a7bf8d5d3bfbddb82cb37dd0561c938 Mon Sep 17 00:00:00 2001
+From: Filip Skoneczny <fskoneczny@gmail.com>
+Date: Sun, 10 Jan 2021 19:07:14 +0100
+Subject: [PATCH] ARM: dts: sun7i: bananapi-m1-plus: Disable OOB IRQ for brcm
+ wifi module
+
+    Based on 23bc805.
+    BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438
+
+Signed-off-by: Filip Skoneczny <fskoneczny@gmail.com>
+---
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+index 32d5d45a35c0..97f9987f51d7 100644
+--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+@@ -193,9 +193,14 @@ &mmc3 {
+ 	brcmf: wifi@1 {
+ 		reg = <1>;
+ 		compatible = "brcm,bcm4329-fmac";
+-		interrupt-parent = <&pio>;
+-		interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
+-		interrupt-names = "host-wake";
+		/*
+		 * OOB interrupt support is broken ATM, drv probe failing with:
+		 * ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110
+		 *
+		 * interrupt-parent = <&pio>;
+		 * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>;
+		 * interrupt-names = "host-wake";
+		 */
+ 	};
+ };
+ 
+-- 
+2.25.1
+
--- a/buildroot/board/sinovoip/m1-plus/post-build.sh
+++ b/buildroot/board/sinovoip/m1-plus/post-build.sh
@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Remove all but the brcmfmac43362 firmware files
+find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete
--- a/buildroot/board/sinovoip/m1-plus/readme.txt
+++ b/buildroot/board/sinovoip/m1-plus/readme.txt
@ -0,0 +1,64 @@
+Banana Pi M1+
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+Buildroot environment for the Banana Pi M1+. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+  $ make bananapi_m1_plus_defconfig
+
+Compile everything and build the SD card image:
+
+  $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ dd if=output/images/sdcard.img of=/dev/sdX
+
+Notes:
+  - replace 'sdX' with the actual device with your micro SD card
+  - you may need to be root to do that (use 'sudo')
+
+Insert the micro SD card in your Banana Pi M1+ and power it up. The console
+is on the debug TTL UART, 115200 8N1.
+
+Ethernet
+==========
+
+  # udhcpc -i eth0
+
+Wifi
+==========
+
+  # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf
+  (enter the wifi password and press enter)
+  # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B
+  # udhcpc -i wlan0
+
+Note:
+  - replace 'YOUR_SSID' with the actual SSID from your access point
+
+Audio
+==========
+
+For this example you need package alsa-utils.
+
+Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pi M1+
+has an on-board microphone, too.
+
+  # amixer cset name='Power Amplifier DAC Playback Switch' on
+  # amixer cset name='Power Amplifier Mute Switch' on
+  # amixer cset name='Power Amplifier Volume' 42
--- a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt
+++ b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt
@ -0,0 +1 @@
+brcmfmac43362-sdio.txt
--- a/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt
+++ b/buildroot/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt
@ -0,0 +1,56 @@
+#AP6210_NVRAM_V1.2_03192013
+manfid=0x2d0
+prodid=0x492
+vendid=0x14e4
+devid=0x4343
+boardtype=0x0598
+
+# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same
+#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305
+boardrev=0x1307
+boardnum=777
+xtalfreq=26000
+boardflags=0x80201
+boardflags2=0x80
+sromrev=3
+wl0id=0x431b
+macaddr=00:90:4c:07:71:12
+aa2g=1
+ag0=2
+maxp2ga0=74
+cck2gpo=0x2222
+ofdm2gpo=0x44444444
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+pa0maxpwr=56
+
+#P207 PA params
+#pa0b0=5447
+#pa0b1=-658
+#pa0b2=-175
+
+#Same PA params for P304,P305, P306, P307
+
+pa0b0=5447
+pa0b1=-607
+pa0b2=-160
+pa0itssit=62
+pa1itssit=62
+
+
+cckPwrOffset=5
+ccode=0
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+triso2g=0
+noise_cal_enable_2g=0
+noise_cal_po_2g=0
+swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff
+temp_add=29767
+temp_mult=425
+
+btc_flags=0x6
+btc_params0=5000
+btc_params1=1000
+btc_params6=63
--- a/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh
+++ b/buildroot/board/stmicroelectronics/common/stm32mp157/post-image.sh
@ -14,6 +14,8 @@ atf_image()
 		echo "tf-a-stm32mp157c-dk2.stm32"
 	elif grep -Eq "DTB_FILE_NAME=stm32mp157a-dk1.dtb" <<< ${ATF_VARIABLES}; then
                echo "tf-a-stm32mp157a-dk1.stm32"
+	elif grep -Eq "DTB_FILE_NAME=stm32mp157a-avenger96.dtb" <<< ${ATF_VARIABLES}; then
+                echo "tf-a-stm32mp157a-avenger96.stm32"
 	fi
 }

--- a/buildroot/boot/arm-trusted-firmware/Config.in
+++ b/buildroot/boot/arm-trusted-firmware/Config.in
@ -15,7 +15,7 @@ choice
 	  Select the specific ATF version you want to use

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

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

 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
-	default "v2.2"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
+	default "v2.4"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
--- a/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
+++ b/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256  07e3c058ae2d95c7d516a46fc93565b797e912c3271ddbf29df523b1ab1ee911  arm-trusted-firmware-v2.2.tar.gz
+sha256  4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d  arm-trusted-firmware-v2.4.tar.gz
 sha256  487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164  license.rst
--- a/buildroot/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/buildroot/boot/at91bootstrap3/at91bootstrap3.mk
@ -24,6 +24,9 @@ ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION),y)
 AT91BOOTSTRAP3_LICENSE_FILES = main.c
 endif

+AT91BOOTSTRAP3_CPE_ID_VENDOR = linux4sam
+AT91BOOTSTRAP3_CPE_ID_PRODUCT = at91bootstrap
+
 AT91BOOTSTRAP3_INSTALL_IMAGES = YES
 AT91BOOTSTRAP3_INSTALL_TARGET = NO

--- a/buildroot/boot/barebox/Config.in
+++ b/buildroot/boot/barebox/Config.in
@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use

 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2020.09.0"
+	bool "2020.11.0"

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

 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2020.09.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2020.11.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
--- a/buildroot/boot/barebox/barebox.hash
+++ b/buildroot/boot/barebox/barebox.hash
@ -1,8 +1,8 @@
-# From https://www.barebox.org/download/barebox-2020.09.0.tar.bz2.md5
-md5  907dc813298fcded06fa9c788d3fb6c8  barebox-2020.09.0.tar.bz2
+# From https://www.barebox.org/download/barebox-2020.11.0.tar.bz2.md5
+md5  1fc2c1a03d7b44dc12fbf4cf1fc6ffe0  barebox-2020.11.0.tar.bz2

 # Locally calculated
-sha256  aad3b0736aa8d368d185736260d81fb3785251f376897be3cec745182fd51869  barebox-2020.09.0.tar.bz2
+sha256  049d2b1b887d0397f4b5390255459fb0240200b06a3276ffaefdeab7fb243554  barebox-2020.11.0.tar.bz2

 # License files, locally computed
 sha256  ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4  COPYING
--- a/buildroot/boot/barebox/barebox.mk
+++ b/buildroot/boot/barebox/barebox.mk
@ -28,7 +28,7 @@ $(1)_SITE_METHOD = git
 # Override the default value of _SOURCE to 'barebox-*' so that it is not
 # downloaded a second time for barebox-aux; also alows avoiding the hash
 # check:
-$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz
+$(1)_SOURCE = barebox-$$($(1)_VERSION)$$(BR_FMT_VERSION_git).tar.gz
 else
 # Handle stable official Barebox versions
 $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2
--- a/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-BOOT_WRAPPER_AARCH64_VERSION = fd74c8cbd0e17483d2299208cad9742bee605ca7
+BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a
 BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
 BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause
 BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
--- a/buildroot/boot/grub2/grub2.mk
+++ b/buildroot/boot/grub2/grub2.mk
@ -37,6 +37,7 @@ GRUB2_INSTALL_TARGET = YES
 else
 GRUB2_INSTALL_TARGET = NO
 endif
+GRUB2_CPE_ID_VENDOR = gnu

 GRUB2_BUILTIN_MODULES = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES))
 GRUB2_BUILTIN_CONFIG = $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_CONFIG))
--- a/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
+++ b/buildroot/boot/mv-ddr-marvell/0001-mv_ddr-mv_ddr4_training_leveling.c-uninitialized-var.patch
@ -1,31 +0,0 @@
-From 5867fcad6e88af3d843bfa831648d84a53732d57 Mon Sep 17 00:00:00 2001
-From: Heinrich Schuchardt <xypron.glpk@gmx.de>
-Date: Wed, 19 Dec 2018 17:17:13 +0100
-Subject: [PATCH] mv_ddr: mv_ddr4_training_leveling.c: uninitialized variable
-
-With GCC 8.2 uninitialized variables lead to a build error.
-
-Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
-Upstream status: commit 5867fcad6e8
-
- mv_ddr4_training_leveling.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mv_ddr4_training_leveling.c b/mv_ddr4_training_leveling.c
-index 144e21a03c01..cb95389f5466 100644
--- a/mv_ddr4_training_leveling.c
-+++ b/mv_ddr4_training_leveling.c
-@@ -368,7 +368,7 @@ static int mv_ddr4_dynamic_pb_wl_supp(u32 dev_num, enum mv_wl_supp_mode ecc_mode
- 	u32 subphy_num = ddr3_tip_dev_attr_get(dev_num, MV_ATTR_OCTET_PER_INTERFACE);
- 	u8 compare_result = 0;
- 	u32 orig_phase;
-	u32 rd_data, wr_data;
-+	u32 rd_data, wr_data = 0;
- 	u32 flag, step;
- 	struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get();
- 	u32 ecc_phy_access_id;
-- 
-2.20.1
-
--- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash
+++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash
@ -1,3 +1,3 @@
 # Locally calculated
-sha256  39dcc8baccb82cbc746d8f82ce7f673e1b1236e8aee0d09e7ab12c27eeb6ecda  mv-ddr-marvell-618dadd1491eb2f7b2fd74313c04f7accddae475.tar.gz
+sha256  bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4  mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz
 sha256  69208236fc322026920b92d1d839ebdc521ca65379bfdb3368a24945e794fc78  ddr3_init.c
--- a/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk
+++ b/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk
@ -4,8 +4,8 @@
 #
 ################################################################################

-# This is the commit for mv_ddr-armada-18.12.0
-MV_DDR_MARVELL_VERSION = 618dadd1491eb2f7b2fd74313c04f7accddae475
+# This is the latest commit on mv-ddr-devel as of 20201207
+MV_DDR_MARVELL_VERSION = 305d923e6bc4236cd3b902f6679b0aef9e5fa52d
 MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION))
 MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial
 MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c
--- a/buildroot/boot/shim/shim.mk
+++ b/buildroot/boot/shim/shim.mk
@ -8,6 +8,7 @@ SHIM_VERSION = 15
 SHIM_SITE = $(call github,rhboot,shim,$(SHIM_VERSION))
 SHIM_LICENSE = BSD-2-Clause
 SHIM_LICENSE_FILES = COPYRIGHT
+SHIM_CPE_ID_VENDOR = redhat
 SHIM_DEPENDENCIES = gnu-efi
 SHIM_INSTALL_TARGET = NO
 SHIM_INSTALL_IMAGES = YES
--- a/buildroot/boot/uboot/Config.in
+++ b/buildroot/boot/uboot/Config.in
@ -41,7 +41,7 @@ choice
 	  Select the specific U-Boot version you want to use

 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2020.10"
+	bool "2021.01"

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

 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2020.10"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2021.01"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@ -229,6 +229,16 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF

 endchoice

+config BR2_TARGET_UBOOT_NEEDS_OPENSBI
+	bool "U-Boot needs OpenSBI"
+	depends on BR2_TARGET_OPENSBI
+	help
+	  Some RISC-V platforms (such as SiFive HiFive Unleashed)
+	  encapsulate the OpenSBI firmware image inside U-Boot.
+	  This option makes sure OpenSBI gets built prior to U-Boot,
+	  and that the OpenSBI variable pointing to OpenSBI binary,
+	  is passed during the Buildroot build.
+
 menu "U-Boot binary format"

 config BR2_TARGET_UBOOT_FORMAT_AIS
--- a/buildroot/boot/uboot/uboot.hash
+++ b/buildroot/boot/uboot/uboot.hash
@ -1,3 +1,3 @@
 # Locally computed:
-sha256  0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622  u-boot-2020.10.tar.bz2
+sha256  b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454  u-boot-2021.01.tar.bz2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
--- a/buildroot/boot/uboot/uboot.mk
+++ b/buildroot/boot/uboot/uboot.mk
@ -11,6 +11,8 @@ UBOOT_LICENSE = GPL-2.0+
 ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y)
 UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
 endif
+UBOOT_CPE_ID_VENDOR = denx
+UBOOT_CPE_ID_PRODUCT = u-boot

 UBOOT_INSTALL_IMAGES = YES

@ -161,14 +163,19 @@ UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin
 endif
 endif

+ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
+UBOOT_DEPENDENCIES += opensbi
+UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin
+endif
+
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
 UBOOT_DEPENDENCIES += host-dtc
 endif

 ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON2),y)
-UBOOT_DEPENDENCIES += host-python
+UBOOT_DEPENDENCIES += host-python host-python-setuptools
 else ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y)
-UBOOT_DEPENDENCIES += host-python3
+UBOOT_DEPENDENCIES += host-python3 host-python3-setuptools
 endif

 ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y)
--- a/Show More
+++ b/Show More