From 5627c2021a69e189e1fc01a505057d63b16f5e62 Mon Sep 17 00:00:00 2001 From: Sören Tempel Date: Fri, 15 Oct 2021 19:14:14 +0200 Subject: main/u-boot: fix ramdisk issues on Hifive Unmatched This issue was reproduced independently by @clandmeter and myself. We are both using this patch, it has been submitted to the u-boot ML and others have agreed that this is a good change [1]. [1]: https://lists.denx.de/pipermail/u-boot/2021-October/463807.html --- main/u-boot/APKBUILD | 4 +++- main/u-boot/hifive-unmatched-ramdisk.patch | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 main/u-boot/hifive-unmatched-ramdisk.patch diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD index 0c356d3d94c..7ae1197a9c2 100644 --- a/main/u-boot/APKBUILD +++ b/main/u-boot/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Milan P. Stanić pkgname=u-boot pkgver=2021.10 -pkgrel=2 +pkgrel=3 pkgdesc="u-boot bootloader common files" url="https://www.denx.de/wiki/U-Boot/" arch="all !s390x !ppc64le" @@ -17,6 +17,7 @@ fi source="https://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 README.txt update-u-boot + hifive-unmatched-ramdisk.patch " builddir="$srcdir"/u-boot-${pkgver//_/-} @@ -176,4 +177,5 @@ sha512sums=" be5be1c9a54b270307a04177d5577a21c57a02b307bf8b63d0fa2655d1f025c7ce010dca6a1f7f60d4e639c2e6fb6f0a292a2e5d190f1fad478eb12dd786c9da u-boot-2021.10.tar.bz2 f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1 README.txt b3b4fb70c4eea2034bae45c513bca7b738be7507b46d3f2d62b31c794cd238d492acf960c95078cb1c945520debd5d2762103df7cef0fc36acfe9ff9a94549fc update-u-boot +64afa2ee6471521d3f57bd780856e4bcaf7cbcd42cbaf3624a1390eebad1d2100722d985ef36a76cd420404a663463ae6702cdd5cf585f0a6ced20f1429a7677 hifive-unmatched-ramdisk.patch " diff --git a/main/u-boot/hifive-unmatched-ramdisk.patch b/main/u-boot/hifive-unmatched-ramdisk.patch new file mode 100644 index 00000000000..d4fad8b0cf2 --- /dev/null +++ b/main/u-boot/hifive-unmatched-ramdisk.patch @@ -0,0 +1,18 @@ +On the HiFive1 the ramdisk is occasionally loaded to the wrong address +range, causing boot to hang during ramdisk loading. This patch fixes +this occasionally occurring issue. + +See https://lists.denx.de/pipermail/u-boot/2021-October/463798.html for +details. + +diff -upr u-boot-2021.10.orig/include/configs/sifive-unmatched.h u-boot-2021.10/include/configs/sifive-unmatched.h +--- u-boot-2021.10.orig/include/configs/sifive-unmatched.h 2021-10-15 19:07:43.123472870 +0200 ++++ u-boot-2021.10/include/configs/sifive-unmatched.h 2021-10-15 19:08:27.357420781 +0200 +@@ -25,6 +25,7 @@ + + #endif + ++#define CONFIG_SYS_BOOTMAPSZ (256 << 20) + #define CONFIG_SYS_SDRAM_BASE 0x80000000 + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + SZ_2M) + -- cgit v1.2.3