diff options
| author | Joel Stanley | 2022-06-20 16:31:17 +0930 |
|---|---|---|
| committer | Tom Rini | 2022-07-01 16:01:25 -0400 |
| commit | c5e2442033d9afe67b1913e192b0eafa74eef856 (patch) | |
| tree | 4bf4fe415bec0ff55e76cf20a63eecca7e37d6a1 | |
| parent | 975918f6a14374f21f094ed5f5262e959190a9d2 (diff) | |
image: fit: Use stack allocation macro
The documentation above the DEFINE_ALIGN_BUFFER says it's for use
outside functions, but we're inside one.
Instead use ALLOC_CACHE_ALIGN_BUFFER, the stack based macro, which also
includes the cache alignment.
Fixes: b583348ca8c8 ("image: fit: Align hash output buffers")
Signed-off-by: Joel Stanley <joel@jms.id.au>
Tested-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
Reviewed-by: Sean Anderson <sean.anderson@seco.com>
| -rw-r--r-- | boot/image-fit.c | 3 | ||||
| -rw-r--r-- | tools/mkimage.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/boot/image-fit.c b/boot/image-fit.c index f57d97f5522..df3e5df8836 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -1264,8 +1264,7 @@ int calculate_hash(const void *data, int data_len, const char *name, static int fit_image_check_hash(const void *fit, int noffset, const void *data, size_t size, char **err_msgp) { - DEFINE_ALIGN_BUFFER(uint8_t, value, FIT_MAX_HASH_LEN, - ARCH_DMA_MINALIGN); + ALLOC_CACHE_ALIGN_BUFFER(uint8_t, value, FIT_MAX_HASH_LEN); int value_len; const char *algo; uint8_t *fit_value; diff --git a/tools/mkimage.h b/tools/mkimage.h index 7652c8b001c..f5ca65e2edf 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -41,8 +41,7 @@ static inline ulong map_to_sysmem(void *ptr) return (ulong)(uintptr_t)ptr; } -#define ARCH_DMA_MINALIGN 1 -#define DEFINE_ALIGN_BUFFER(type, name, size, alugn) type name[size] +#define ALLOC_CACHE_ALIGN_BUFFER(type, name, size) type name[size] #define MKIMAGE_TMPFILE_SUFFIX ".tmp" #define MKIMAGE_MAX_TMPFILE_LEN 256 |