From 5ab897cf40fa767c5910e0c78acc33c5419fb374 Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Tue, 30 Jun 2020 01:20:50 +0700
Subject: [PATCH] uboot: Added riscv64 support

---
 features.in/uboot/config.mk | 9 +++++++++
 pkg.in/lists/uboot          | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/features.in/uboot/config.mk b/features.in/uboot/config.mk
index aeeb6aea..fc86fcce 100644
--- a/features.in/uboot/config.mk
+++ b/features.in/uboot/config.mk
@@ -6,7 +6,16 @@ UBOOT_TTY := use/tty/S0
 endif
 endif
 
+ifeq (,$(filter-out riscv64,$(ARCH)))
+UBOOT_TTY := use/tty/S0
+endif
+
 use/uboot: use/kernel/initrd-setup $(UBOOT_TTY)
 	@$(call add_feature)
 	@$(call add,THE_LISTS,singleboard-tools)
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
 	@$(call add,BASE_BOOTARGS,cma=192M)
+endif
+ifeq (,$(filter-out riscv64,$(ARCH)))
+	@$(call add,BASE_BOOTARGS,earlyprintk debug no_alt_virt_keyboard)
+endif
diff --git a/pkg.in/lists/uboot b/pkg.in/lists/uboot
index a76bd7b6..9ceacd33 100644
--- a/pkg.in/lists/uboot
+++ b/pkg.in/lists/uboot
@@ -2,4 +2,6 @@ raspberrypi-firmware@ARM
 u-boot-meson@aarch64
 u-boot-sunxi@ARM
 u-boot-rockchip@aarch64
-u-boot-hifive-unleashed@riscv64
+fu540-bootloaders@riscv64
+opensbi-firmware-fu540@riscv64
+opensbi-firmware-qemu@riscv64