random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2022-07-01-additional-critical-fixes-and-updates'

Browse Source 
- Update some MAINTAINERS entries, fix a regression on FIT images
This commit is contained in:
Tom Rini 2022-07-02 09:54:46 -04:00
commit 6cae9aeeab
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@ -1064,8 +1064,9 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-mmc.git
F: drivers/mmc/ F: drivers/mmc/
NAND FLASH NAND FLASH
#M: Scott Wood <oss@buserror.net> M: Dario Binacchi <dario.binacchi@amarulasolutions.com>
S: Orphaned (Since 2018-07) M: Michael Trimarchi <michael@amarulasolutions.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git T: git https://source.denx.de/u-boot/custodians/u-boot-nand-flash.git
F: drivers/mtd/nand/raw/ F: drivers/mtd/nand/raw/

2
board/BuR/brppt1/MAINTAINERS
View File

@ -1,5 +1,5 @@
BRPPT1 BOARD BRPPT1 BOARD
M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
S: Maintained S: Maintained
F: board/BuR/brppt1/ F: board/BuR/brppt1/
F: include/configs/brppt1.h F: include/configs/brppt1.h

2
board/BuR/brppt2/MAINTAINERS
View File

@ -1,5 +1,5 @@
BUR_PPT2 BOARD BUR_PPT2 BOARD
M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
S: Maintained S: Maintained
F: board/BuR/brppt2/ F: board/BuR/brppt2/
F: include/configs/brppt2.h F: include/configs/brppt2.h

2
board/BuR/brsmarc1/MAINTAINERS
View File

@ -1,5 +1,5 @@
BRSMARC1 BOARD BRSMARC1 BOARD
M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
S: Maintained S: Maintained
F: board/BuR/brsmarc1/ F: board/BuR/brsmarc1/
F: include/configs/brsmarc1.h F: include/configs/brsmarc1.h

2
board/BuR/brxre1/MAINTAINERS
View File

@ -1,5 +1,5 @@
BRXRE1 BOARD BRXRE1 BOARD
M: Hannes Schmelzer <hannes.schmelzer@br-automation.com> M: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
S: Maintained S: Maintained
F: board/BuR/brxre1/ F: board/BuR/brxre1/
F: include/configs/brxre1.h F: include/configs/brxre1.h

3
boot/image-fit.c
View File

@ -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, static int fit_image_check_hash(const void *fit, int noffset, const void *data,
size_t size, char **err_msgp) size_t size, char **err_msgp)
{ {
DEFINE_ALIGN_BUFFER(uint8_t, value, FIT_MAX_HASH_LEN, ALLOC_CACHE_ALIGN_BUFFER(uint8_t, value, FIT_MAX_HASH_LEN);
ARCH_DMA_MINALIGN);
int value_len; int value_len;
const char *algo; const char *algo;
uint8_t *fit_value; uint8_t *fit_value;

3
tools/mkimage.h
View File

@ -41,8 +41,7 @@ static inline ulong map_to_sysmem(void *ptr)
return (ulong)(uintptr_t)ptr; return (ulong)(uintptr_t)ptr;
} }
#define ARCH_DMA_MINALIGN 1 #define ALLOC_CACHE_ALIGN_BUFFER(type, name, size) type name[size]
#define DEFINE_ALIGN_BUFFER(type, name, size, alugn) type name[size]
#define MKIMAGE_TMPFILE_SUFFIX ".tmp" #define MKIMAGE_TMPFILE_SUFFIX ".tmp"
#define MKIMAGE_MAX_TMPFILE_LEN 256 #define MKIMAGE_MAX_TMPFILE_LEN 256