diff options
| author | Tom Rini <[email protected]> | 2022-08-11 22:20:01 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-08-11 22:20:01 -0400 |
| commit | f5003e0791dbe796bf7b41515d67ae5527679ec9 (patch) | |
| tree | 0a0a1401b0f1da9114460fe3fcbfc50142663920 /common | |
| parent | 157861e6afa5c26134639e8a8f34540141672a0a (diff) | |
| parent | aa0eda17cf98448c3ef826204f38c76bf48b3345 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 8 | ||||
| -rw-r--r-- | common/spl/spl_opensbi.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index ee98810e9e9..70d97815f0a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1488,6 +1488,14 @@ config SPL_OPENSBI_LOAD_ADDR help Load address of the OpenSBI binary. +config SPL_OPENSBI_SCRATCH_OPTIONS + hex "Scratch options passed to OpenSBI" + default 0x1 + depends on SPL_OPENSBI + help + Options passed to fw_dynamic, for example SBI_SCRATCH_NO_BOOT_PRINTS or + SBI_SCRATCH_DEBUG_PRINTS. + config SPL_TARGET string "Addtional build targets for 'make'" default "spl/u-boot-spl.srec" if RCAR_GEN2 diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index 1c0abf8553a..b0f40076c34 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -66,12 +66,12 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image) if (ret) ret = fit_image_get_load(spl_image->fdt_addr, uboot_node, &uboot_entry); - /* Prepare obensbi_info object */ + /* Prepare opensbi_info object */ opensbi_info.magic = FW_DYNAMIC_INFO_MAGIC_VALUE; opensbi_info.version = FW_DYNAMIC_INFO_VERSION; opensbi_info.next_addr = uboot_entry; opensbi_info.next_mode = FW_DYNAMIC_INFO_NEXT_MODE_S; - opensbi_info.options = SBI_SCRATCH_NO_BOOT_PRINTS; + opensbi_info.options = CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS; opensbi_info.boot_hart = gd->arch.boot_hart; opensbi_entry = (void (*)(ulong, ulong, ulong))spl_image->entry_point; |