diff options
| author | Tom Rini <trini@konsulko.com> | 2025-05-26 16:07:19 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-05-26 16:07:19 -0600 |
| commit | 39b815d02d7ce6af32bcf023d20243c404b75a84 (patch) | |
| tree | 68cd13fa83e90f69bf8c989fbcde768b676eb6d7 /common/board_r.c | |
| parent | bab54f5942c428be698216224fd10b91d974d4da (diff) | |
| parent | 2ca1398a5ece8d33d8feb6b410e6e38588b5d2bc (diff) | |
Merge tag 'v2025.07-rc3' into next
Prepare v2025.07-rc3
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c index 65ff5fb595c..980bd3813af 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -814,7 +814,9 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) if (CONFIG_IS_ENABLED(X86_64) && !IS_ENABLED(CONFIG_EFI_APP)) arch_setup_gd(new_gd); -#if !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) +#if defined(CONFIG_RISCV) + set_gd(new_gd); +#elif !defined(CONFIG_X86) && !defined(CONFIG_ARM) && !defined(CONFIG_ARM64) gd = new_gd; #endif gd->flags &= ~GD_FLG_LOG_READY; |