diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-23 21:48:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-23 21:48:53 -0500 |
| commit | 16121280188d3daa57b18ad623d0845bbbb5a90a (patch) | |
| tree | 1eced38d4dbbb8aa8813ed7095aedd06f0226ec1 /common | |
| parent | a516416d75a9b0f52e9d63d47f8a7bd53239767c (diff) | |
| parent | 6c8945ec41cb7bff27fbacc88316e3e557c20240 (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 10 | ||||
| -rw-r--r-- | common/hash.c | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index 0bdce64ca5..7f594d9eaf 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -200,6 +200,13 @@ static int init_func_i2c(void) } #endif +#if defined(CONFIG_VID) +__weak int init_func_vid(void) +{ + return 0; +} +#endif + #if defined(CONFIG_HARD_SPI) static int init_func_spi(void) { @@ -801,6 +808,9 @@ static const init_fnc_t init_sequence_f[] = { #if defined(CONFIG_SYS_I2C) init_func_i2c, #endif +#if defined(CONFIG_VID) && !defined(CONFIG_SPL) + init_func_vid, +#endif #if defined(CONFIG_HARD_SPI) init_func_spi, #endif diff --git a/common/hash.c b/common/hash.c index cf4d70f852..69d53ed251 100644 --- a/common/hash.c +++ b/common/hash.c @@ -390,7 +390,7 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, if (multi_hash()) { struct hash_algo *algo; - uint8_t output[HASH_MAX_DIGEST_SIZE]; + u8 *output; uint8_t vsum[HASH_MAX_DIGEST_SIZE]; void *buf; @@ -405,6 +405,9 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, return 1; } + output = memalign(ARCH_DMA_MINALIGN, + sizeof(uint32_t) * HASH_MAX_DIGEST_SIZE); + buf = map_sysmem(addr, len); algo->hash_func_ws(buf, len, output, algo->chunk_size); unmap_sysmem(buf); @@ -440,6 +443,8 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, store_result(algo, output, *argv, flags & HASH_FLAG_ENV); } + unmap_sysmem(output); + } /* Horrible code size hack for boards that just want crc32 */ |