From c03a8988b8824278605afe385516653307bfd4c0 Mon Sep 17 00:00:00 2001
From: Marius Kriegerowski <marius.kriegerowski@gmail.com>
Date: Mon, 17 May 2021 13:10:45 +0200
Subject: [PATCH 1/3] default to 'boot' as boot partition label

Defaulting to the $MACHINE may lead to failure if the name was
longer than the limit of allowed volume label of fat (11 chars).

Signed-off-by: Marius Kriegerowski <marius.kriegerowski@gmail.com>
---
 classes/sdcard_image-sunxi.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass
index a0f63a8..4675716 100644
--- a/classes/sdcard_image-sunxi.bbclass
+++ b/classes/sdcard_image-sunxi.bbclass
@@ -17,7 +17,7 @@ inherit image_types
 IMAGE_TYPEDEP_sunxi-sdimg = "${SDIMG_ROOTFS_TYPE}"
 
 # Boot partition volume id
-BOOTDD_VOLUME_ID ?= "${MACHINE}"
+BOOTDD_VOLUME_ID ?= "boot"
 
 # Boot partition size [in KiB]
 BOOT_SPACE ?= "40960"

From edb10c82bdb1f5062e60ad2d1a0f43f3f6c23c8d Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Fri, 21 May 2021 21:14:52 +0200
Subject: [PATCH 2/3] Added support for bananapi-m64 machine

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 conf/machine/bananapi-m64.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 conf/machine/bananapi-m64.conf

diff --git a/conf/machine/bananapi-m64.conf b/conf/machine/bananapi-m64.conf
new file mode 100644
index 0000000..c4669a4
--- /dev/null
+++ b/conf/machine/bananapi-m64.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: pine64-plus
+#@DESCRIPTION: Machine configuration for the pine64-plus, based on Allwinner A64 CPU
+
+require conf/machine/include/sun50i.inc
+
+KERNEL_DEVICETREE = "allwinner/sun50i-a64-bananapi-m64.dtb"
+UBOOT_MACHINE = "bananapi_m64_defconfig"

From 3caf03d9fcfce69bb7e5bb5fe80e6aecd29b4a85 Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Wed, 30 Jun 2021 11:08:56 +0200
Subject: [PATCH 3/3] xradio-firmware: Update to latest master

Old version seems to have random crashes when using softap functionality

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 recipes-kernel/xradio-firmware/xradio-firmware.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/xradio-firmware/xradio-firmware.bb b/recipes-kernel/xradio-firmware/xradio-firmware.bb
index 0520b97..0d7bd6c 100644
--- a/recipes-kernel/xradio-firmware/xradio-firmware.bb
+++ b/recipes-kernel/xradio-firmware/xradio-firmware.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=0ceb3372c9595f0a
 PV = "1.0"
 PR = "r0"
 
-SRCREV = "bddd21b7f895be9f0c37e435f0a7ac84405c6091"
+SRCREV = "761658e1701c77a0a84706754e6db1a25ee60b82"
 
 COMPATIBLE_MACHINE = "orange-pi-zero"