diff options
| author | Stefano Babic <[email protected]> | 2019-03-31 19:54:10 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2019-03-31 19:54:10 +0200 |
| commit | 66c433ed4342e5761ee9b048c85fe47d31130b2e (patch) | |
| tree | 60977b825765ebe490b01aae2154002eeea6a76b /common | |
| parent | 4b387deb78dcbe491c1f73fdd758f4ca3307bbbe (diff) | |
| parent | c3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <[email protected]>
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, |