commit 0f0df4b131411715bae605ac1af868cd6ac873b7
author Tom Rini <trini@konsulko.com> Mon Jul 22 09:38:04 2024 -0600
committer Tom Rini <trini@konsulko.com> Mon Jul 22 09:38:04 2024 -0600
tree 3e6973f1cfee13e3acb9b6b156d53028480d5f2f
parent 977498969bb5968ab33fe205c732a112c9af0bfc
parent ee037f5bed44c76acd6a30a848dc96db5461cb3e

Merge https://source.denx.de/u-boot/custodians/u-boot-riscv

arch/riscv/dts/jh7110-u-boot.dtsi

diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi
index c09d5c9..2f560e7 100644
--- a/arch/riscv/dts/jh7110-u-boot.dtsi
+++ b/arch/riscv/dts/jh7110-u-boot.dtsi
@@ -93,10 +93,6 @@
 	bootph-pre-ram;
 };
 
-&pllclk {
-	bootph-pre-ram;
-};
-
 &S7_0 {
 	status = "okay";
 };

arch/riscv/lib/Makefile

diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 9a05b66..65dc49f 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -26,6 +26,7 @@
 obj-$(CONFIG_$(SPL_)SMP) += smp.o
 obj-$(CONFIG_SPL_BUILD)	+= spl.o
 obj-y   += fdt_fixup.o
+obj-$(CONFIG_$(SPL)CMD_BDI) += bdinfo.o
 
 # For building EFI apps
 CFLAGS_NON_EFI := -fstack-protector-strong

arch/riscv/lib/bdinfo.c

diff --git a/arch/riscv/lib/bdinfo.c b/arch/riscv/lib/bdinfo.c
new file mode 100644
index 0000000..7734e51
--- /dev/null
+++ b/arch/riscv/lib/bdinfo.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * RISC-V-specific information for the 'bdinfo' command
+ */
+
+#include <init.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void arch_print_bdinfo(void)
+{
+	bdinfo_print_num_l("boot hart", gd->arch.boot_hart);
+
+	if (gd->arch.firmware_fdt_addr)
+		bdinfo_print_num_ll("firmware fdt",
+				    (long long)gd->arch.firmware_fdt_addr);
+}

arch/riscv/lib/semihosting.S

diff --git a/arch/riscv/lib/semihosting.S b/arch/riscv/lib/semihosting.S
index c0c571b..49bb419 100644
--- a/arch/riscv/lib/semihosting.S
+++ b/arch/riscv/lib/semihosting.S
@@ -8,7 +8,7 @@
 
 .pushsection .text.smh_trap, "ax"
 ENTRY(smh_trap)
-	.align	2
+	.align	4		/* keep slli, ebreak, srai in same page */
 	.option	push
 	.option	norvc		/* semihosting sequence must be 32-bit wide */
 

board/sifive/unmatched/unmatched.env

diff --git a/board/sifive/unmatched/unmatched.env b/board/sifive/unmatched/unmatched.env
index 0f1e5a7..34425dc 100644
--- a/board/sifive/unmatched/unmatched.env
+++ b/board/sifive/unmatched/unmatched.env
@@ -16,4 +16,4 @@
     name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1};
     name=loader2,size=4MB,type=${type_guid_gpt_loader2};
     name=system,size=-,bootable,type=${type_guid_gpt_system};
-fdtfile= CONFIG_DEFAULT_FDT_FILE
+fdtfile=CONFIG_DEFAULT_FDT_FILE