Bump Meson64 u-boot to 2021.04 (#2756)

* Move Meson64 to 2021.04
* Detacth C2 from its special u-boot settings

config/sources/families/include/meson64_common.inc

@@ -5,7 +5,7 @@ LINUXFAMILY=meson64
 ARCH=arm64
 SERIALCON=ttyAML0
 SRC_LOADADDR='LOADADDR=0x1080000'
-BOOTBRANCH="tag:v2021.01"
+BOOTBRANCH="tag:v2021.04"
 OVERLAY_PREFIX='meson'
 
 # this family does not need it

config/sources/families/meson-gxbb.conf

@@ -3,8 +3,6 @@ if [[ $BOARD == odroidc2 ]]; then
 	UBOOT_TARGET_MAP=";;$SRC/cache/sources/odroidc2-blobs/bl1.bin.hardkernel u-boot.bin"
 fi
 
-BOOTBRANCH="tag:v2021.04-rc3"
-
 uboot_custom_postprocess()
 {
 	if [[ $BOARD == odroidc2 ]]; then

patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch

@@ -1,8 +1,18 @@
+From 6fa451b69255ff5175272505a5f9b037b0113067 Mon Sep 17 00:00:00 2001
+From: Igor Pecovnik <igor.pecovnik@gmail.com>
+Date: Mon, 5 Apr 2021 20:24:38 +0200
+Subject: [PATCH] Patching something
+
+Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
+---
+ include/configs/meson64.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
 diff --git a/include/configs/meson64.h b/include/configs/meson64.h
-index d82a674..8e9a724 100644
+index 7e97f890..e45abb29 100644
 --- a/include/configs/meson64.h
 +++ b/include/configs/meson64.h
-@@ -83,10 +83,14 @@
+@@ -77,11 +77,15 @@
  	"stdout=" STDOUT_CFG "\0" \
  	"stderr=" STDOUT_CFG "\0" \
  	"fdt_addr_r=0x08008000\0" \
@@ -11,9 +21,13 @@ index d82a674..8e9a724 100644
  	"kernel_addr_r=0x08080000\0" \
  	"pxefile_addr_r=0x01080000\0" \
 +	"loadaddr=0x01080000\0" \
+ 	"fdtoverlay_addr_r=0x01000000\0" \
  	"ramdisk_addr_r=0x13000000\0" \
 +	"initrd_start=0x13000000\0" \
 +	"bloader=ext4load mmc 0:1\0" \
  	"fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
  	BOOTENV
  #endif
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+