diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-15 09:59:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-15 09:59:47 -0400 |
| commit | d9e85eeebabd5fc0c95be96bd70fa7362eb89f33 (patch) | |
| tree | f3f4c2a9d5d19e8b548ce6ed98fbd5610d30bdd7 /common/spl/spl_fit.c | |
| parent | 1520af3f8450bb58168fe1cc827a56d435e9f74c (diff) | |
| parent | 0cd933bb4bd74084d942c42098ebf9e07d9e0f63 (diff) | |
Merge branch '2022-09-15-general-improvements' into next
- Add uncompressed kernel image support to falcon mode, TEE
improvements, make xyz-modem timeout configurable, gpio updates and
other assorted improvements.
Diffstat (limited to 'common/spl/spl_fit.c')
| -rw-r--r-- | common/spl/spl_fit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index a35be52965..c1ed31e367 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -10,7 +10,7 @@ #include <gzip.h> #include <image.h> #include <log.h> -#include <malloc.h> +#include <memalign.h> #include <mapmem.h> #include <spl.h> #include <sysinfo.h> @@ -429,7 +429,9 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, * depending on how the overlay is stored, so * don't fail yet if the allocation failed. */ - tmpbuffer = malloc(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ); + size_t size = CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ; + + tmpbuffer = malloc_cache_aligned(size); if (!tmpbuffer) debug("%s: unable to allocate space for overlays\n", __func__); @@ -537,7 +539,7 @@ static void *spl_get_fit_load_buffer(size_t size) { void *buf; - buf = malloc(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_SYS_SPL_MALLOC_SIZE\n"); |