From 04b26c98965c11161031425a9494c25f0f2353b0 Mon Sep 17 00:00:00 2001 From: Hannes Schmelzer Date: Wed, 29 Jun 2022 12:11:40 +0200 Subject: [PATCH 1/3] board/BuR/*: replace maintainer of BuR boards Since I'm leaving the company with end of June, the maintainership will be transferred to Wolfgang Wallner. Signed-off-by: Hannes Schmelzer Signed-off-by: Wolfgang Wallner --- board/BuR/brppt1/MAINTAINERS | 2 +- board/BuR/brppt2/MAINTAINERS | 2 +- board/BuR/brsmarc1/MAINTAINERS | 2 +- board/BuR/brxre1/MAINTAINERS | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS index 9eddab4208..6b45508f0f 100644 --- a/board/BuR/brppt1/MAINTAINERS +++ b/board/BuR/brppt1/MAINTAINERS @@ -1,5 +1,5 @@ BRPPT1 BOARD -M: Hannes Schmelzer +M: Wolfgang Wallner S: Maintained F: board/BuR/brppt1/ F: include/configs/brppt1.h diff --git a/board/BuR/brppt2/MAINTAINERS b/board/BuR/brppt2/MAINTAINERS index a1b5bd49bf..fe65188f3d 100644 --- a/board/BuR/brppt2/MAINTAINERS +++ b/board/BuR/brppt2/MAINTAINERS @@ -1,5 +1,5 @@ BUR_PPT2 BOARD -M: Hannes Schmelzer +M: Wolfgang Wallner S: Maintained F: board/BuR/brppt2/ F: include/configs/brppt2.h diff --git a/board/BuR/brsmarc1/MAINTAINERS b/board/BuR/brsmarc1/MAINTAINERS index c6dfc20f4d..8d1fe216a4 100644 --- a/board/BuR/brsmarc1/MAINTAINERS +++ b/board/BuR/brsmarc1/MAINTAINERS @@ -1,5 +1,5 @@ BRSMARC1 BOARD -M: Hannes Schmelzer +M: Wolfgang Wallner S: Maintained F: board/BuR/brsmarc1/ F: include/configs/brsmarc1.h diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS index eb0fe8b283..5aa36713d4 100644 --- a/board/BuR/brxre1/MAINTAINERS +++ b/board/BuR/brxre1/MAINTAINERS @@ -1,5 +1,5 @@ BRXRE1 BOARD -M: Hannes Schmelzer +M: Wolfgang Wallner S: Maintained F: board/BuR/brxre1/ F: include/configs/brxre1.h From 975918f6a14374f21f094ed5f5262e959190a9d2 Mon Sep 17 00:00:00 2001 From: Michael Trimarchi Date: Wed, 29 Jun 2022 17:57:51 +0200 Subject: [PATCH 2/3] MAINTAINERS: Add Dario and Michael as NAND maintainers Both of us are working on NAND subsystem on several architectures and we have boards and projects to improve the subsystem in uboot. The idea is to guarantee quick feedback on patches sent on mailing list and most of the time the possibilities to test them. Cc: Dario Binacchi Signed-off-by: Michael Trimarchi Acked-by: Tom Rini --- MAINTAINERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a15ba7abdc..7f27ff4c20 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1064,8 +1064,9 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-mmc.git F: drivers/mmc/ NAND FLASH -#M: Scott Wood -S: Orphaned (Since 2018-07) +M: Dario Binacchi +M: Michael Trimarchi +S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git F: drivers/mtd/nand/raw/ From c5e2442033d9afe67b1913e192b0eafa74eef856 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 20 Jun 2022 16:31:17 +0930 Subject: [PATCH 3/3] 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 Tested-by: Chia-Wei Wang Reviewed-by: Sean Anderson --- boot/image-fit.c | 3 +-- tools/mkimage.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boot/image-fit.c b/boot/image-fit.c index f57d97f552..df3e5df883 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 7652c8b001..f5ca65e2ed 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