mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-04 02:11:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2022-08-11 22:20:01 -04:00
commit f5003e0791
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/riscv/cpu/start.S
View File

@ -140,9 +140,12 @@ call_harts_early_init:
* accesses gd). * accesses gd).
*/ */
mv gp, s0 mv gp, s0
#if CONFIG_IS_ENABLED(RISCV_MMODE)
bnez tp, secondary_hart_loop bnez tp, secondary_hart_loop
#endif #endif
#endif
mv a0, s0
jal board_init_f_init_reserve jal board_init_f_init_reserve
SREG s1, GD_FIRMWARE_FDT_ADDR(gp) SREG s1, GD_FIRMWARE_FDT_ADDR(gp)

17
board/AndesTech/ax25-ae350/ax25-ae350.c
View File

@ -54,17 +54,22 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
return 0; return 0;
} }
#define ANDES_HW_DTB_ADDRESS 0xF2000000
void *board_fdt_blob_setup(int *err) void *board_fdt_blob_setup(int *err)
{ {
*err = 0; *err = 0;
#if defined(CONFIG_OF_BOARD)
return (void *)(ulong)gd->arch.firmware_fdt_addr; if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) {
#elif defined(CONFIG_OF_SEPARATE) if (gd->arch.firmware_fdt_addr)
return (void *)CONFIG_SYS_FDT_BASE; return (void *)(ulong)gd->arch.firmware_fdt_addr;
#else }
if (fdt_magic(CONFIG_SYS_FDT_BASE) == FDT_MAGIC)
return (void *)CONFIG_SYS_FDT_BASE;
return (void *)ANDES_HW_DTB_ADDRESS;
*err = -EINVAL; *err = -EINVAL;
return NULL; return NULL;
#endif
} }
int smc_init(void) int smc_init(void)

8
common/spl/Kconfig
View File

@ -1488,6 +1488,14 @@ config SPL_OPENSBI_LOAD_ADDR
help help
Load address of the OpenSBI binary. 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 config SPL_TARGET
string "Addtional build targets for 'make'" string "Addtional build targets for 'make'"
default "spl/u-boot-spl.srec" if RCAR_GEN2 default "spl/u-boot-spl.srec" if RCAR_GEN2

4
common/spl/spl_opensbi.c
View File

@ -66,12 +66,12 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image)
if (ret) if (ret)
ret = fit_image_get_load(spl_image->fdt_addr, uboot_node, &uboot_entry); 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.magic = FW_DYNAMIC_INFO_MAGIC_VALUE;
opensbi_info.version = FW_DYNAMIC_INFO_VERSION; opensbi_info.version = FW_DYNAMIC_INFO_VERSION;
opensbi_info.next_addr = uboot_entry; opensbi_info.next_addr = uboot_entry;
opensbi_info.next_mode = FW_DYNAMIC_INFO_NEXT_MODE_S; 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_info.boot_hart = gd->arch.boot_hart;
opensbi_entry = (void (*)(ulong, ulong, ulong))spl_image->entry_point; opensbi_entry = (void (*)(ulong, ulong, ulong))spl_image->entry_point;