diff options
| author | Tom Rini <[email protected]> | 2019-05-10 07:07:49 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-05-10 07:07:49 -0400 |
| commit | 927a37df9f5ed33fc350b9cc509d9f50ffaf5cd2 (patch) | |
| tree | 0afab773bb17cb8f33ab6e2e2b969423ec36140b /common | |
| parent | f30f268a07b0c9e4418366debc9ad0100a47cea4 (diff) | |
| parent | 0d7b6cffa532eecfdc7cb87c2c65cd311344981f (diff) | |
Merge branch '2019-05-09-master-imports'
- Minor fixes (ata memory leak, implement feedback on ohci-da8xx
changes, avb test fix, mmc test fix, spelling fixes, make FIT really
optional, fit-dtb blob cleanups, TI K3 workflow improvements, bootz
can boot barebox on 32bit ARM).
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 2 | ||||
| -rw-r--r-- | common/fdt_support.c | 12 | ||||
| -rw-r--r-- | common/spl/Kconfig | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/common/bootm.c b/common/bootm.c index b5d37d38db8..d1937516478 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -924,6 +924,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) memmove(to, from, len); } +#if defined(CONFIG_FIT_SIGNATURE) static int bootm_host_load_image(const void *fit, int req_image_type) { const char *fit_uname_config = NULL; @@ -988,5 +989,6 @@ int bootm_host_load_images(const void *fit, int cfg_noffset) /* Return the first error we found */ return err; } +#endif #endif /* ndef USE_HOSTCC */ diff --git a/common/fdt_support.c b/common/fdt_support.c index ab08a0114fe..4e7cf6ebe98 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -597,6 +597,7 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize) uint64_t addr, size; int total, ret; uint actualsize; + int fdt_memrsv = 0; if (!blob) return 0; @@ -606,6 +607,7 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize) fdt_get_mem_rsv(blob, i, &addr, &size); if (addr == (uintptr_t)blob) { fdt_del_mem_rsv(blob, i); + fdt_memrsv = 1; break; } } @@ -627,10 +629,12 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize) /* Change the fdt header to reflect the correct size */ fdt_set_totalsize(blob, actualsize); - /* Add the new reservation */ - ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize); - if (ret < 0) - return ret; + if (fdt_memrsv) { + /* Add the new reservation */ + ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize); + if (ret < 0) + return ret; + } return actualsize; } diff --git a/common/spl/Kconfig b/common/spl/Kconfig index dd078fe79d1..c7cd34449a5 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -282,7 +282,7 @@ config SPL_SHA1_SUPPORT checksum is a 160-bit (20-byte) hash value used to check that the image contents have not been corrupted or maliciously altered. While SHA1 is fairly secure it is coming to the end of its life - due to the expanding computing power avaiable to brute-force + due to the expanding computing power available to brute-force attacks. For more security, consider SHA256. config SPL_SHA256_SUPPORT |