diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-07 09:30:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-07 09:30:59 -0500 |
| commit | a14af7216a220fe8f1b2a5308ed632abe6f9f97f (patch) | |
| tree | 4306307c8f9955c56861127d1f5adad54ebec80b /board/sifive/unleashed/unleashed.c | |
| parent | c00c147dae51f06e012841371f9baffb4b9dc1b3 (diff) | |
| parent | 75f080df46f28f24a617652c8af028cc349f908b (diff) | |
Merge branch '2022-01-06-assorted-important-fixes'
- Revert a clk change, to enable some platforms to work again
- Updates to the udoo NEO family of boards to work correctly
- Fix SiFive Unleashes/Unmatched boards booting
- Update rockchip maintainer entry
Diffstat (limited to 'board/sifive/unleashed/unleashed.c')
| -rw-r--r-- | board/sifive/unleashed/unleashed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index 3c3e0e1d0d..f8aad862c6 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -117,7 +117,7 @@ int misc_init_r(void) void *board_fdt_blob_setup(int *err) { *err = 0; - if (IS_ENABLED(CONFIG_OF_SEPARATE)) { + if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) { if (gd->arch.firmware_fdt_addr) return (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr; } |