diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-02 07:03:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-02 07:03:25 -0400 |
| commit | d312d9831f25a8e70d64df46fb2fe9aab2e8c939 (patch) | |
| tree | 9afa8b258222e66221f8239d8ad51372d63c5ac3 /common/spl | |
| parent | 25049ad560826f7dc1c4740883b0016014a59789 (diff) | |
| parent | bc39e06778168a34bb4e0a34fbee4edbde4414d8 (diff) | |
| download | u-boot-d312d9831f25a8e70d64df46fb2fe9aab2e8c939.zip u-boot-d312d9831f25a8e70d64df46fb2fe9aab2e8c939.tar.gz u-boot-d312d9831f25a8e70d64df46fb2fe9aab2e8c939.tar.bz2 | |
Merge branch 'next'
Merge in all changes from the next branch now that the release is out.
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 3 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index b65c439..e06bc75 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -909,6 +909,9 @@ ulong spl_relocate_stack_gd(void) #if CONFIG_IS_ENABLED(DM) dm_fixup_for_gd_move(new_gd); #endif +#if CONFIG_IS_ENABLED(LOG) + log_fixup_for_gd_move(new_gd); +#endif #if !defined(CONFIG_ARM) && !defined(CONFIG_RISCV) gd = new_gd; #endif diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 872df0c..e5195d4 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -550,7 +550,12 @@ static void *spl_get_fit_load_buffer(size_t size) buf = malloc_cache_aligned(size); if (!buf) { pr_err("Could not get FIT buffer of %lu bytes\n", (ulong)size); - pr_err("\tcheck CONFIG_SPL_SYS_MALLOC_SIZE\n"); + + if (IS_ENABLED(CONFIG_SPL_SYS_MALLOC)) + pr_err("\tcheck CONFIG_SPL_SYS_MALLOC_SIZE\n"); + else + pr_err("\tcheck CONFIG_SPL_SYS_MALLOC_F_LEN\n"); + buf = spl_get_load_buffer(0, size); } return buf; |