diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-22 19:09:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-22 19:09:58 -0400 |
| commit | cfb3e102c4bdf96a41cbd3eeb1d3a9a56c69c46c (patch) | |
| tree | 5951f299b8b05cb6011deb8522a8b883a5d260e2 /common | |
| parent | 7b80644e271544848db90fb0407d67b3e3749a8e (diff) | |
| parent | 2e7365518acdb8fb6e9be332c8a6c57b457188d9 (diff) | |
Merge branch '2019-03-22-master-imports'
- Don't attempt to write to ext4 volumes with the metadata_csum feature
we don't support
- Correct how we build dtb files.
- Fix regression on SPL_FIT with FIT_IMAGE_TINY
- Minor TI platform fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-android-dt.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/common/image-android-dt.c b/common/image-android-dt.c index c0683ee70f3..69168261793 100644 --- a/common/image-android-dt.c +++ b/common/image-android-dt.c @@ -53,8 +53,8 @@ bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr, entry_size = fdt32_to_cpu(hdr->dt_entry_size); unmap_sysmem(hdr); - if (index > entry_count) { - printf("Error: index > dt_entry_count (%u > %u)\n", index, + if (index >= entry_count) { + printf("Error: index >= dt_entry_count (%u >= %u)\n", index, entry_count); return false; } diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index db436268cbc..c9bfe0cc8ae 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -491,6 +491,10 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, if (!spl_fit_image_get_os(fit, node, &os_type)) debug("Loadable is %s\n", genimg_get_os_name(os_type)); +#if CONFIG_IS_ENABLED(FIT_IMAGE_TINY) + else + os_type = IH_OS_U_BOOT; +#endif if (os_type == IH_OS_U_BOOT) { spl_fit_append_fdt(&image_info, info, sector, |