colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2023-09-06-riscv-fixes' into next

Browse Source 
- Merge two patches to fix the issues with risc-v building on next after
  the merge of v2023.10-rc4 to next.
This commit is contained in:
Tom Rini
2023-09-06 11:00:10 -04:00
parent b53ab97150 59d2a7d731
commit 98b35c7fdb
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/riscv/cpu/cpu.c
View File

@@ -66,7 +66,7 @@ static inline bool supports_extension(char ext)
#endif /* CONFIG_CPU */ #endif /* CONFIG_CPU */
} }
static int riscv_cpu_probe(void *ctx, struct event *event) static int riscv_cpu_probe(void)
{ {
#ifdef CONFIG_CPU #ifdef CONFIG_CPU
int ret; int ret;
@@ -79,7 +79,7 @@ static int riscv_cpu_probe(void *ctx, struct event *event)
return 0; return 0;
} }
EVENT_SPY(EVT_DM_POST_INIT_R, riscv_cpu_probe); EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_R, riscv_cpu_probe);
/* /*
* This is called on secondary harts just after the IPI is init'd. Currently * This is called on secondary harts just after the IPI is init'd. Currently
@@ -94,11 +94,7 @@ static void dummy_pending_ipi_clear(ulong hart, ulong arg0, ulong arg1)
int riscv_cpu_setup(void) int riscv_cpu_setup(void)
{ {
int ret; int __maybe_unused ret;
ret = riscv_cpu_probe(ctx, event);
if (ret)
return ret;
/* Enable FPU */ /* Enable FPU */
if (supports_extension('d') || supports_extension('f')) { if (supports_extension('d') || supports_extension('f')) {