U-Boot 2021.07-rc4+dfsg-1ubuntu1 cannot boot Hifive Unmatched

When trying to boot with

U-Boot 2021.07-rc4+dfsg-1ubuntu1

on an HiFive Unmatched board it fails with:

Moving Image from 0x84000000 to 0x80200000, end=81f11000
## Flattened Device Tree blob at 88000000
   Booting using the fdt blob at 0x88000000
   Loading Ramdisk to fa149000, end ffffffd3 ...

The system hangs here.

Copying the initrd results in overwriting the relocated U-Boot binary in memory.

Please, apply the following diff:

diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index d63a5f62fb..874c6c4e08 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -62,6 +62,8 @@
        "name=system,size=-,bootable,type=${type_guid_gpt_system};"

 #define CONFIG_EXTRA_ENV_SETTINGS \
+ "fdt_high=0xffffffffffffffff\0" \
+ "initrd_high=0xffffffffffffffff\0" \
        "kernel_addr_r=0x84000000\0" \
        "fdt_addr_r=0x88000000\0" \
        "scriptaddr=0x88100000\0" \

Best regards

Heinrich