diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-02 09:54:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-02 09:54:46 -0400 |
| commit | 6cae9aeeab374fd4ab1e38cc8473ef8de6dc42ed (patch) | |
| tree | 4bf4fe415bec0ff55e76cf20a63eecca7e37d6a1 | |
| parent | 936d468b7bbc8c02071b3d0d24f9c48167cb5ce7 (diff) | |
| parent | c5e2442033d9afe67b1913e192b0eafa74eef856 (diff) | |
Merge branch '2022-07-01-additional-critical-fixes-and-updates'
- Update some MAINTAINERS entries, fix a regression on FIT images
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/BuR/brppt1/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/BuR/brppt2/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/BuR/brsmarc1/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/BuR/brxre1/MAINTAINERS | 2 | ||||
| -rw-r--r-- | boot/image-fit.c | 3 | ||||
| -rw-r--r-- | tools/mkimage.h | 3 |
7 files changed, 9 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a15ba7abdcd..7f27ff4c20f 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 <oss@buserror.net> -S: Orphaned (Since 2018-07) +M: Dario Binacchi <dario.binacchi@amarulasolutions.com> +M: Michael Trimarchi <michael@amarulasolutions.com> +S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git F: drivers/mtd/nand/raw/ diff --git a/board/BuR/brppt1/MAINTAINERS b/board/BuR/brppt1/MAINTAINERS index 9eddab42089..6b45508f0f0 100644 --- a/board/BuR/brppt1/MAINTAINERS +++ b/board/BuR/brppt1/MAINTAINERS @@ -1,5 +1,5 @@ BRPPT1 BOARD -M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> +M: Wolfgang Wallner <wolfgang.wallner@br-automation.com> S: Maintained F: board/BuR/brppt1/ F: include/configs/brppt1.h diff --git a/board/BuR/brppt2/MAINTAINERS b/board/BuR/brppt2/MAINTAINERS index a1b5bd49bf5..fe65188f3d8 100644 --- a/board/BuR/brppt2/MAINTAINERS +++ b/board/BuR/brppt2/MAINTAINERS @@ -1,5 +1,5 @@ BUR_PPT2 BOARD -M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> +M: Wolfgang Wallner <wolfgang.wallner@br-automation.com> S: Maintained F: board/BuR/brppt2/ F: include/configs/brppt2.h diff --git a/board/BuR/brsmarc1/MAINTAINERS b/board/BuR/brsmarc1/MAINTAINERS index c6dfc20f4d7..8d1fe216a44 100644 --- a/board/BuR/brsmarc1/MAINTAINERS +++ b/board/BuR/brsmarc1/MAINTAINERS @@ -1,5 +1,5 @@ BRSMARC1 BOARD -M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> +M: Wolfgang Wallner <wolfgang.wallner@br-automation.com> S: Maintained F: board/BuR/brsmarc1/ F: include/configs/brsmarc1.h diff --git a/board/BuR/brxre1/MAINTAINERS b/board/BuR/brxre1/MAINTAINERS index eb0fe8b2838..5aa36713d4e 100644 --- a/board/BuR/brxre1/MAINTAINERS +++ b/board/BuR/brxre1/MAINTAINERS @@ -1,5 +1,5 @@ BRXRE1 BOARD -M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> +M: Wolfgang Wallner <wolfgang.wallner@br-automation.com> S: Maintained F: board/BuR/brxre1/ F: include/configs/brxre1.h 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 |