diff options
| author | Tom Rini <[email protected]> | 2024-07-22 09:38:04 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-22 09:38:04 -0600 |
| commit | b614f3b58fed4589098cd691be7bfb719dc4b35a (patch) | |
| tree | 3e6973f1cfee13e3acb9b6b156d53028480d5f2f | |
| parent | 5024a96db8ea6ff2e814f4599af9e5faf09296b7 (diff) | |
| parent | dd3cd9eecc9846e7c37a97c9755d2a83fb995cbb (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
| -rw-r--r-- | arch/riscv/dts/jh7110-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/riscv/lib/Makefile | 1 | ||||
| -rw-r--r-- | arch/riscv/lib/bdinfo.c | 18 | ||||
| -rw-r--r-- | arch/riscv/lib/semihosting.S | 2 | ||||
| -rw-r--r-- | board/sifive/unmatched/unmatched.env | 2 |
5 files changed, 21 insertions, 6 deletions
diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi index c09d5c91708..2f560e7296f 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"; }; diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 9a05b662fd6..65dc49f6fa5 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -26,6 +26,7 @@ obj-y += setjmp.o 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 diff --git a/arch/riscv/lib/bdinfo.c b/arch/riscv/lib/bdinfo.c new file mode 100644 index 00000000000..7734e51d670 --- /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); +} diff --git a/arch/riscv/lib/semihosting.S b/arch/riscv/lib/semihosting.S index c0c571bce9b..49bb419a962 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 */ diff --git a/board/sifive/unmatched/unmatched.env b/board/sifive/unmatched/unmatched.env index 0f1e5a71747..34425dc9efa 100644 --- a/board/sifive/unmatched/unmatched.env +++ b/board/sifive/unmatched/unmatched.env @@ -16,4 +16,4 @@ partitions= 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 |