From 12259d74691b4dd21534e293a41f8862656d5f6f Mon Sep 17 00:00:00 2001
From: Daiane Angolini <angolini@gmail.com>
Date: Tue, 27 Dec 2022 10:18:14 -0300
Subject: [PATCH] u-boot-starfive: Backport recipe from master

Signed-off-by: Daiane Angolini <angolini@gmail.com>
---
 .../u-boot/u-boot-starfive_v2021.04.bb        | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
index 557390b..7644355 100644
--- a/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-starfive_v2021.04.bb
@@ -1,15 +1,29 @@
 require recipes-bsp/u-boot/u-boot-common.inc
 require recipes-bsp/u-boot/u-boot.inc
 
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI = "git://github.com/starfive-tech/u-boot.git;protocol=https;branch=Fedora_VIC_7100_2021.04 \
+BRANCH:visionfive = "JH7100_VisionFive_OH_dev"
+BRANCH:beaglev-starlight-jh7100 = "Fedora_JH7100_2021.04"
+
+SRC_URI = "git://github.com/starfive-tech/u-boot.git;protocol=https;branch=${BRANCH} \
            file://tftp-mmc-boot.txt \
-           file://977abc529f98c1c90a80ad280fe9e58ddd43c87a.patch \
-           file://2feaab2bd04ed736c637518b3b553615f0c97890.patch \
           "
 
+SRC_URI:append:beaglev-starlight-jh7100 = " \
+           file://977abc529f98c1c90a80ad280fe9e58ddd43c87a.patch \
+           file://2feaab2bd04ed736c637518b3b553615f0c97890.patch \
+           "
+
+SRC_URI:append:visionfive = " \
+           file://fix-riscv-isa.patch \
+           file://uEnv-visionfive.txt \
+"
+
 SRCREV = "7b70e1d44ba9702a519ca936cabf19070309123a"
+SRCREV:visionfive = "ccecef294d355e9d05edf0bb6058002a0fe08908"
 
 DEPENDS:append = " u-boot-tools-native"
 
@@ -22,6 +36,13 @@ do_configure:prepend() {
         -d ${WORKDIR}/tftp-mmc-boot.txt ${WORKDIR}/${UBOOT_ENV_BINARY}
 }
 
-COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100)"
+do_deploy:append:visionfive() {
+    install -m 644 ${WORKDIR}/uEnv-visionfive.txt ${DEPLOYDIR}/uEnv.txt
+}
+
+COMPATIBLE_MACHINE = "(beaglev-starlight-jh7100|visionfive)"
 
 TOOLCHAIN = "gcc"
+
+# U-boot sets O=... which needs it to build outside of S
+B = "${WORKDIR}/build"