Add sys-boot/opensbi-1.0 and sys-boot/u-boot-2022.06

4 files changed, 135 insertions, 0 deletions

diff --git a/sys-boot/opensbi/Manifest b/sys-boot/opensbi/Manifest
index 88f0439..a2bef87 100644
--- a/sys-boot/opensbi/Manifest
+++ b/sys-boot/opensbi/Manifest
@@ -5,7 +5,9 @@ DIST opensbi-0.9.zip 290818 BLAKE2B 5a8903c118faea18fc8e6b023ca0b1a393da2deb57f8
 DIST opensbi-0.9_p1.zip 356165 BLAKE2B 5d714bce95940d4e02effdffc9beaafaa47c919c0715c7ece1a26653368550f933e8a577126a4fc04cfe8e37e340e24af26601879795671815d09438b6fe6724 SHA512 3c1f7d07b6ff0063c33d2e2248d3abf2ccf63025fa0922bf44dad567dc125925ebb67e557c94c83ba7399201e47d12ef0f643c12e9c2bfcf46f2570fe1486e7a
 DIST opensbi-0.9_p2.zip 369395 BLAKE2B 9c741be123eb958c8e43c9aec4bbe2c3a257d59996f2913022f2e9e974ba48ca5cdacd597431b31d296f9b1a6947bc9994a9ef0ea6a7cdfdd37bc14b90e4d70d SHA512 e382ef4fd7ed27cac14237b37159dbc077141bab2a714d39f349c027576d4c60496c9c1db9841091cceb46896224d14ea288a4d43f7b5c07491afed08db07b88
 DIST opensbi-0.9_p3.zip 370844 BLAKE2B 0a0cc5a141bf87478938998ce6a39e5ece436e506bc99bc40dde8e019efc4e50fb35c17987dc613b706e92ba959951b7b399d62c415b2f4f0713c5f9dbbb4426 SHA512 e68a29d9638539137f5edb8a4b425a79ca5bf1807bd4570b9fd7f1f0209b663bc4a01fda5adbdbb296aef92295a00f4001a5df8401da5782e84ec867d117754a
+DIST opensbi-1.0.zip 393191 BLAKE2B ebd88bcdc34b6387cca3dd31426ade6157a92cb2804e1c8c976f9e3f717977b5ace844da2d3fd2afdbc1112f6e1faac70dc9fc7b680218452c5b8cf713ed4e70 SHA512 e825c3ca2f9fc3c341191fd6170b39b402de0848eac11b8667c0d1dd13a9101bb6d5f2ee310114d051b17bed84d41d39214baa9d7680b559260d30b69e980bb5
 EBUILD opensbi-0.9.ebuild 1078 BLAKE2B e0c862d73eeeac60869c95acdc3a8138a4b0169d90fa2a38d65fdf53bf132e306defa4971f004132e093136bc8a1c4e2a5407cfd2f20ef312f1fe9323c6e1397 SHA512 2d1c2ecb7a663ff637eab3f383d3c046834ebd7018d85bde7a7efe4a0bb47965f140488de4cbd39911dac8029c941410f1baa5384d81349f6f84a2d4b16c8fba
 EBUILD opensbi-0.9_p1.ebuild 1201 BLAKE2B 5a40e1b15605a6f355066fd27e60dd56266cea432b891f2d6994f02dad50b3491d4bc8231d0a5e6ee63eb3b7316c937d4260d14ab65b46d89ca731036861bb21 SHA512 adfd1ed96d6a467ff554f19a6bc3186be8ed88babb2e15d3ea3ed1dcfc569cacb3c3a8289bdbd7b72dbe23dc90daf8ab925bdbe9dbe08ae89778fbc196b7a95b
 EBUILD opensbi-0.9_p2.ebuild 1210 BLAKE2B 040ebfd319c73713d0d83ccb83ad1e57e1b9219fbc07ddaf83bb2a9c70f0f3b64e21a9dc5c239c1dd1bd37ab40aae84c42f35b2fcf9e55c42796521fee82d908 SHA512 406520e76f9a1eebdcd97db0c0ef54ce6a39476313613332c949dc28b704e9ddcc40370d3982aa3a05d84d7e6f01615ab146b4bff480c19b74756bb72792cab3
 EBUILD opensbi-0.9_p3.ebuild 923 BLAKE2B a8643246bc0e8778be446d40b0232d1589f8e0cfb8ec183d49695419fdea8fdbf31bbac4d5e0c3d93ac8c0d21c994ee6565c6eb5206fb47cdc3674512b45b184 SHA512 39724f314948caeb329fc27bae9454b7ee4e612c62a440590f1c8cd5dde31a7580c4f4a736e02d208b47d7bf69f67878607008ac86aa5571e6def064af379a5c
+EBUILD opensbi-1.0.ebuild 923 BLAKE2B 4787f56a8e872a7f675b556d8788f143c513a4cad1b4ecab6bfde67fe8ef9dda174e967fa37c6c95c70909f4679ace83445ccc35807bcbd94ae90042456fb8e7 SHA512 033ee6cd6c54266d1d5d49f8fb95d3165abe4e6f418e633d79e18c1946492fb25623428116a4ceca0d595940cb3af9ea9db12d3db2ae1133499a22039bde4045
diff --git a/sys-boot/opensbi/opensbi-1.0.ebuild b/sys-boot/opensbi/opensbi-1.0.ebuild
new file mode 100644
index 0000000..ec120e2
--- /dev/null
+++ b/sys-boot/opensbi/opensbi-1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+OPENSBI_COMMIT="fab0379bb60d6e177018b53f07718b69ba34948d"
+
+DESCRIPTION="RISC-V Supervisor Binary Interface (SBI)"
+HOMEPAGE="https://github.com/riscv/${PN}/tree/v${PV}"
+SRC_URI="https://github.com/riscv-software-src/${PN}/archive/${OPENSBI_COMMIT}.zip -> ${P}.zip"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~riscv"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_unpack() {
+	unpack ${P}.zip
+	mv "${WORKDIR}/opensbi-${OPENSBI_COMMIT}" "${WORKDIR}/${P}"
+}
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	emake PLATFORM=generic FW_PIC=n
+}
+
+src_install() {
+	mkdir -p "${D}/usr/share/${P}"
+	cp "${WORKDIR}/${P}/build/platform/generic/firmware/fw_dynamic.bin" "${D}/usr/share/${P}"
+	elog "Installed OpenSBI at /usr/share/${P}/fw_dynamic.bin"
+	dodoc CONTRIBUTORS.md
+	dodoc COPYING.BSD
+	dodoc README.md
+	dodoc ThirdPartyNotices.md
+}
diff --git a/sys-boot/u-boot/Manifest b/sys-boot/u-boot/Manifest
index 48ebc4f..c31c423 100644
--- a/sys-boot/u-boot/Manifest
+++ b/sys-boot/u-boot/Manifest
@@ -3,10 +3,13 @@ AUX sifive-unmached-fdt-initrd-env.patch 600 BLAKE2B 456f264d9c0ab45ce50573bb49b
 DIST meta-sifive-2021.05.zip 664346 BLAKE2B ca98d75c4fc255f3ec99c3e9667e1a5e43fc1db88b83010db3766ff8e70acfaf2741dde96da65265aeef5ca82e1cc93a96ea771dd48cc2c9ff4af24d3feb4b82 SHA512 e60052fc183ddd89a4b0a2a443aedfe22c20ce1134925d6c0d52946ce9a5ca04750408fcb7b191ecc30b4d4b21c9e2f262d0d2b89527923a7cd82dc01a7f2345
 DIST meta-sifive-2021.07.zip 797851 BLAKE2B 074b54a4e461d5098ea54a0171ebd394f2af9126dc1480681528a2c0f46f7cd85647a03d19129a0028622b2b4f2f48de49912c9bd591ecccd16145f8cd2d454c SHA512 e083400e4bf32ebf625d6807a96d3b3baf20ccdf1eb55d5d71eef9c1af5640dc499c7a82e6452dd28f57d339a601af29c8bc1e0e7bc58b670e11ce98d733582d
 DIST meta-sifive-2021.11.zip 455636 BLAKE2B b2abf1e707f0dd7a12c28ec54a53754006827cda5a7d428bbd121d0df1b11c1eb776ef88c6bd30943092a2c6324e1a9961186d0f0a35aaee90446a0e1e1fea8f SHA512 4bd1c3dc11e7b9415ddc8c15d139925e29ce22532911fd426a66d753d4a9e29ee0948224b5ab40dd0c354583ca579084429021e95e32ede3f71c33ddf9625a04
+DIST meta-sifive-2022.06.zip 70476 BLAKE2B c1be47172f42a5147f1b1e9e03868d824477d4f12408b0be998e9ffc6f27c9a6a10a8edb2cba3f68df6796a8cd0bbf8151d79daaa4cbc56d75204d76796a3f1f SHA512 04373048a244059c6b33967bac042674680640a4616306ebd5901475e866f2e088d83e4d3148d0a8a687cda24c44f814372d9bd022ad25d1ebf1180a1b4e63ba
 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
 DIST u-boot-2021.10.tar.gz 22244295 BLAKE2B 509fa0b1fedd359b987dec597c38b63ab7276cbea49ee1bf86cbacd0f3c3bcde66496164cbc161faf1b972a0358e7a1e4379ba39fe0b01c2aabda5911d5830fa SHA512 0d57f4c580a184ac1aded9089b1acbddef2258b833ad5b1b1aa78085a88f5a3a37d76256c456db726eca0592fb14af2fbd359ce7514084698fd80439fd905885
+DIST u-boot-2022.06.tar.gz 22791864 BLAKE2B 20c96c6035c8dd6b3aae985064231d48ce02feddf9f392f022a94cb82525ea93f5467f38afebf5733e095b7b0a3ad9142c25b543f4172eb334802f128e0db867 SHA512 41d86f0196c85cde4e96372e658d13ffc4caf3903a46ab52c7823d9444c246860a288e9d6b66cbdace092e749b3bc99514e1c82d2a59a2642db748f0880894bf
 EBUILD u-boot-2021.01_rc5.ebuild 2659 BLAKE2B 0db14b146e2b876ccfe602fa2b3a6a1693717b8d7e4669b0b02c1b4787466ae7e136798ca85767c3c9613684fc541de1e3ec8eae17de26abe859e95b525c04da SHA512 edf949380cf957797e6e41790f440ad8351edba0037970767eafc28a1ed77b82b63f23900994c3746a4c7ebe28f77a426e8a3fd6a243ecde797f8294b5d80bda
 EBUILD u-boot-2021.07.ebuild 2719 BLAKE2B dec3f05954aaa90bc31eaaa4a481c4974fbd9f1144ce3577eb04759bef28883bd83692bb9bb14969d5410c735df8b5373df08a7b0c5a0eaf6780e576e7b95b8d SHA512 ccfc2787055595c0f29d820bc5ecec17ed83cec1dc2561aea8f99639674186fbaa00098ef23982047bb5a73978ad111efb1722a59873e4b3661f2dbb83dbabf5
 EBUILD u-boot-2021.10.ebuild 2657 BLAKE2B 7ba9e0d2513f0f7b1a29aa6e603a9c5a19223b1c5d2d3e25a57e2809cde18e9d2af5326bd32ce427a5f17b178052ed732788af031e2f0ab345ed252d11135b3f SHA512 b0a30dc78b736368e1697e67ccc1ae4b4bce7a70952ac9761d0c7b22b65c1be5b0727132ed63fd1da3ae4bd4fc7639c07832c66aa5969c23658480cc5766a25d
+EBUILD u-boot-2022.06.ebuild 2657 BLAKE2B 6a4bdca14d8626e89c65e48fbb094b9ca91407e1194fad2dbb9e9916162c808eea7af437b5fcf559679481a3b965d018860a8af82514a657c98bf8bc661e228d SHA512 fac98e2920ba7ba487f4afb5556cccaaeec9438db62c73deb99b75ece4979ba98e1dacaba2382e26d1f731ab44031a6b35421564159271a9d88e9c6e2abc6c89
 MISC metadata.xml 785 BLAKE2B fcfc4e1be03d1b5d8c03200e016576c99b31a415ec1a7177993ca9629bd4c979c68bafe2dbfe57cae5eefae4140349e2984f43ed0e1a183606b3e3235ea93062 SHA512 f5d6160b664ec093929760ed4c83ad9505dc2f0c285d05e2a63b403f7e9674af6a96f9eedbf6b692fb4a56336365f822f96e6608d0aaea50400d9615c995297d
diff --git a/sys-boot/u-boot/u-boot-2022.06.ebuild b/sys-boot/u-boot/u-boot-2022.06.ebuild
new file mode 100644
index 0000000..5a5942a
--- /dev/null
+++ b/sys-boot/u-boot/u-boot-2022.06.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+META_SIFIVE="2022.06"
+UBOOT_COMMIT="e4b6ebd3de982ae7185dbf689a030e73fd06e0d2"
+
+DESCRIPTION="U-Boot with meta-sifive-${META_SIFIVE} patches"
+HOMEPAGE="https://source.denx.de/u-boot/u-boot"
+SRC_URI="https://source.denx.de/u-boot/u-boot/-/archive/${UBOOT_COMMIT}/u-boot-${UBOOT_COMMIT}.tar.gz -> ${P}.tar.gz
+		https://github.com/sifive/meta-sifive/archive/refs/heads/${META_SIFIVE}.zip -> meta-sifive-${META_SIFIVE}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~riscv"
+
+DEPEND="sys-boot/opensbi sys-apps/dtc dev-lang/swig"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+IUSE="-1000 -1100 +1200 -1300 -1400 -1500 -1600 -1700 efi-priority"
+REQUIRED_USE="^^ ( 1000 1100 1200 1300 1400 1500 1600 1700 )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack meta-sifive-${META_SIFIVE}.zip
+	mv "${WORKDIR}/u-boot-${UBOOT_COMMIT}" "${WORKDIR}/${P}"
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/meta-sifive-${META_SIFIVE}/recipes-bsp/u-boot/files/riscv64"
+
+	# A default, just to be sure
+	CONFIG_SPEED=1200000000
+
+	# Check use flags
+	use 1000 && CONFIG_SPEED=1000000000
+	use 1100 && CONFIG_SPEED=1100000000
+	use 1200 && CONFIG_SPEED=1200000000
+	use 1300 && CONFIG_SPEED=1300000000
+	use 1400 && CONFIG_SPEED=1400000000
+	use 1500 && CONFIG_SPEED=1500000000
+	use 1600 && CONFIG_SPEED=1600000000
+	use 1700 && CONFIG_SPEED=1700000000
+
+	# 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"
+
+	if use efi-priority; then
+		eapply "${FILESDIR}/efi-priority.patch"
+	fi
+
+	eapply_user
+}
+
+src_configure()
+{
+	# Apply Unmatched defconfig
+	emake sifive_unmatched_defconfig
+}
+
+src_compile() {
+	# Find opensbi
+	export OPENSBI=`find /usr/share/opensbi-* -name fw_dynamic.bin | sort | tail -n 1`
+	if [ -z "$OPENSBI" ]; then
+		die "Can't find OpenSBI, is sys-boot/opensbi installed?"
+	fi
+	elog "Using OpenSBI at ${OPENSBI}"
+
+	# Start the build
+	emake
+}
+
+src_install() {
+	mkdir -p "${D}/usr/share/${P}"
+	cp "${WORKDIR}/${P}/u-boot.itb" "${D}/usr/share/${P}"
+	cp "${WORKDIR}/${P}/spl/u-boot-spl.bin" "${D}/usr/share/${P}"
+}
+
+pkg_postinst()
+{
+	einfo "U-Boot files have been installed in /usr/share/${P}. In order"
+	einfo "to boot with this U-Boot you need to install it to the correct partitions"
+	einfo "with 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\">"
+}