Add patch to sys-boot/u-boot-2021.07 to make it work

3 files changed, 18 insertions, 5 deletions

diff --git a/sys-boot/u-boot/Manifest b/sys-boot/u-boot/Manifest
index a110604..d6bf081 100644
--- a/sys-boot/u-boot/Manifest
+++ b/sys-boot/u-boot/Manifest
@@ -1,8 +1,9 @@
 AUX efi-priority.patch 1008 BLAKE2B f054f8f6a06f81bfbb79ef87e5ade7f6df8d7fe11bff4742a7988deaa4bfa0f64332571a30a475689b0e86994462b4e66750d3059e594bd5d72067ae0be97e2c SHA512 d7266dd81e6c1bd20f27513ac046a70d88d064238e250ff3a430c6c588f2ff594512d4374ced7cf9edabbaeacd6f1d901ac679edacb47f5dee76b17f45193f50
+AUX sifive-unmached-fdt-initrd-env.patch 600 BLAKE2B 456f264d9c0ab45ce50573bb49bfa437782916b567d1e619e901eb7693fa439d9ed4238ee9678c7e532f6ff90dd8a7f64ff36fcdfa4c34907ea7e94e5af319fd SHA512 d2e740b47c3c2c08cf87eb6a2bd43cf42ed6d530ae9c15f51bc777f30c614b871c4aac0eed6f36636238355eb13889054bad2c2fadf85c496b7ce0265518e6ae
 DIST meta-sifive-2021.05.zip 664346 BLAKE2B ca98d75c4fc255f3ec99c3e9667e1a5e43fc1db88b83010db3766ff8e70acfaf2741dde96da65265aeef5ca82e1cc93a96ea771dd48cc2c9ff4af24d3feb4b82 SHA512 e60052fc183ddd89a4b0a2a443aedfe22c20ce1134925d6c0d52946ce9a5ca04750408fcb7b191ecc30b4d4b21c9e2f262d0d2b89527923a7cd82dc01a7f2345
 DIST meta-sifive-2021.07.zip 797851 BLAKE2B 074b54a4e461d5098ea54a0171ebd394f2af9126dc1480681528a2c0f46f7cd85647a03d19129a0028622b2b4f2f48de49912c9bd591ecccd16145f8cd2d454c SHA512 e083400e4bf32ebf625d6807a96d3b3baf20ccdf1eb55d5d71eef9c1af5640dc499c7a82e6452dd28f57d339a601af29c8bc1e0e7bc58b670e11ce98d733582d
 DIST u-boot-2021.01_rc5.tar.gz 20920395 BLAKE2B ba28811074191d97cdfa2e1e70083a113531a69285ad5e1f662f9d9715007b5441a043adf2592ab406295b1f85089aab7193068bf6f5a92af224bdde4aae21c7 SHA512 1c215c1b71e24d24838249e72ca2d97e3b857176d761a99a6a94597a3ab65940dc3f302c451559411691c716a4c73267f280a46a52d1f4ad97fec7eb13951444
 DIST u-boot-2021.07.tar.gz 22092291 BLAKE2B 411ddeacbc3fd1d6125c07b206d804323fb269ecc8f5b0781a6bd215609662f7e4e4203eddf6fd611c756ee9670ecbdbfce17944f78bfa524067d17e7e0e6484 SHA512 900bf89971e1fd52d207aab2f1e3f76f9834b47ab2b82e37c09e11ceba6404c40a9d2fe04b82814034f199685dae10fbb68a26539ff36cb8ea0503f047fa5a91
 EBUILD u-boot-2021.01_rc5.ebuild 2659 BLAKE2B 0db14b146e2b876ccfe602fa2b3a6a1693717b8d7e4669b0b02c1b4787466ae7e136798ca85767c3c9613684fc541de1e3ec8eae17de26abe859e95b525c04da SHA512 edf949380cf957797e6e41790f440ad8351edba0037970767eafc28a1ed77b82b63f23900994c3746a4c7ebe28f77a426e8a3fd6a243ecde797f8294b5d80bda
-EBUILD u-boot-2021.07.ebuild 2748 BLAKE2B 8df0f168d303a115812aa1a56652bf4ab8443a0f106415ce7d9c9a4ab6939051fcb26270b80f06d90d352d2a64a3809f8896cea05479ee520e204e74ee6c758a SHA512 95280fc492393a151fee99b479a34454b004a1ec1ef9fd0e00d47c3ad1451c8e4b49a184b7ce97003c9f727fa3d1669b40e1d406f4d3dcf600b0af782fd91aae
+EBUILD u-boot-2021.07.ebuild 2719 BLAKE2B dec3f05954aaa90bc31eaaa4a481c4974fbd9f1144ce3577eb04759bef28883bd83692bb9bb14969d5410c735df8b5373df08a7b0c5a0eaf6780e576e7b95b8d SHA512 ccfc2787055595c0f29d820bc5ecec17ed83cec1dc2561aea8f99639674186fbaa00098ef23982047bb5a73978ad111efb1722a59873e4b3661f2dbb83dbabf5
 MISC metadata.xml 785 BLAKE2B fcfc4e1be03d1b5d8c03200e016576c99b31a415ec1a7177993ca9629bd4c979c68bafe2dbfe57cae5eefae4140349e2984f43ed0e1a183606b3e3235ea93062 SHA512 f5d6160b664ec093929760ed4c83ad9505dc2f0c285d05e2a63b403f7e9674af6a96f9eedbf6b692fb4a56336365f822f96e6608d0aaea50400d9615c995297d
diff --git a/sys-boot/u-boot/files/sifive-unmached-fdt-initrd-env.patch b/sys-boot/u-boot/files/sifive-unmached-fdt-initrd-env.patch
new file mode 100644
index 0000000..8526849
--- /dev/null
+++ b/sys-boot/u-boot/files/sifive-unmached-fdt-initrd-env.patch
@@ -0,0 +1,12 @@
+diff -Naur u-boot-2021.07/include/configs/sifive-unmatched.h u-boot-2021.07-mod/include/configs/sifive-unmatched.h
+--- u-boot-2021.07/include/configs/sifive-unmatched.h	2021-07-05 17:11:28.000000000 +0200
++++ u-boot-2021.07-mod/include/configs/sifive-unmatched.h	2021-07-31 18:58:45.597873661 +0200
+@@ -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" \
diff --git a/sys-boot/u-boot/u-boot-2021.07.ebuild b/sys-boot/u-boot/u-boot-2021.07.ebuild
index fe97196..e7d5d41 100644
--- a/sys-boot/u-boot/u-boot-2021.07.ebuild
+++ b/sys-boot/u-boot/u-boot-2021.07.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://source.denx.de/u-boot/u-boot/-/archive/${UBOOT_COMMIT}/u-boot-$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~riscv"
 
 DEPEND="sys-boot/opensbi sys-apps/dtc dev-lang/swig"
 RDEPEND="${DEPEND}"
@@ -44,7 +44,7 @@ src_prepare() {
 	use 1600 && CONFIG_SPEED=1600000000
 	use 1700 && CONFIG_SPEED=1700000000
 
-	# Actaually modify the dtsi file
+	# Actually modify the dtsi file
 	sed -i -E -e "/cpus/,/cpu0/ s/assigned-clock-rates = <[0-9]+>/assigned-clock-rates = <${CONFIG_SPEED}>/"  "${WORKDIR}/${P}/arch/riscv/dts/fu740-c000-u-boot.dtsi"
 	elog "Set CPU frquency to $((CONFIG_SPEED/1000000)) Mhz"
 
@@ -52,6 +52,8 @@ src_prepare() {
 		eapply "${FILESDIR}/efi-priority.patch"
 	fi
 
+	eapply "${FILESDIR}/sifive-unmached-fdt-initrd-env.patch"
+
 	eapply_user
 }
 
@@ -86,6 +88,4 @@ pkg_postinst()
 	einfo "dd. For example:"
 	einfo "dd if=/usr/share/${P}/u-boot-spl.bin of=<partition with type \"HiFive Unleashed FSBL\">"
 	einfo "dd if=/usr/share/${P}/u-boot.itb of=<partition with type \"HiFive Unleashed BBL\">"
-	einfo ""
-	ewarn "This version does not boot correctly, it is not keyworded for a reason :-)"
 }